Merge remote branch 'origin/btdun'
authorDan Williams <dcbw@redhat.com>
Thu, 18 Feb 2010 18:18:20 +0000 (10:18 -0800)
committerDan Williams <dcbw@redhat.com>
Thu, 18 Feb 2010 18:18:20 +0000 (10:18 -0800)
commitc5eb684718840965b45ded372c7ec7d4b902cc5f
tree33d8b8e0ecce9079f071943dc475a5f10051f73b
parent23f26b300f151bfdbe02068d57c867076cee7542
parent183c256bad931a757e3252ecd433a001d5470104
Merge remote branch 'origin/btdun'
include/NetworkManager.h
marshallers/nm-marshal.list
src/Makefile.am