[dbus/f19: 3/3] Merge branch 'master' into f19

[Colin Walters]

commit 68a51885895c1e0c86cf9be2afa73a09d75cb1b0
Merge: dbe0d8b 658e65f
Author: Colin Walters <walters at verbum.org>
Date:   Mon Jun 17 18:13:20 2013 -0400

    Merge branch 'master' into f19
    
    Conflicts:
    	dbus.spec

 .gitignore |    1 +
 dbus.spec  |    8 ++++++--
 sources    |    2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)
---