Merge branch 'modern-autofoo-32245' into dbus-1.4
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Fri, 25 Feb 2011 11:30:17 +0000 (11:30 +0000)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Fri, 25 Feb 2011 11:30:17 +0000 (11:30 +0000)
commit20d2f1702fc602d70fc2ed7a016289679106098e
tree238b1709534c9e1f3b924ca1effc3ce6cee3fbbe
parent7848abe6c2b90b66fbf1fd7e582324b28766b8de
parentfb06b43956355619a2513bfda41a32185be8a9c8
Merge branch 'modern-autofoo-32245' into dbus-1.4