[dbus: 3/3] Merge commit '637471407a9c75a5aef52564dae3670d9d3915b8'

[Adam Williamson]

commit a1f736db885a532a4d02b8309495a2d80c1623e3
Merge: aa455da 6374714
Author: Adam Williamson <awilliam at redhat.com>
Date:   Wed Nov 9 15:26:32 2011 -0800

    Merge commit '637471407a9c75a5aef52564dae3670d9d3915b8'
    
    Conflicts:
    	dbus.spec

 dbus.spec |   27 ++++++++++-----------------
 1 files changed, 10 insertions(+), 17 deletions(-)
---