[PackageKit/f20: 5/5] Merge branch 'master' into f20

[Rex Dieter]

commit 7940216bf752c6e60f92258fbe57cc33f4a9b282
Merge: 9a79393 0be265f
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Dec 7 13:06:12 2013 -0600

    Merge branch 'master' into f20
    
    Conflicts:
    	PackageKit.spec

 0022-Use-syslog-correctly.patch |  105 +++++++++++++++++++++++++++++++++++++++
 PackageKit.spec                 |    7 ++-
 2 files changed, 111 insertions(+), 1 deletions(-)
---