[fedup/f19: 7/7] Merge branch 'master' into f19

[Adam Williamson]

commit 264e16849279a36da99a20c86e251182b42fb930
Merge: 1c24455 fc9711f
Author: Adam Williamson <awilliam at redhat.com>
Date:   Fri Feb 28 14:12:04 2014 -0800

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

 .gitignore                                         |    1 +
 ...-startup-when-packagedir-isn-t-on-root-10.patch |   32 +++++++++++++++++
 ...-VERSION-if-etc-debian_release-exists-105.patch |   33 ++++++++++++++++++
 ...n-the-user-if-upgrade-contains-no-kernels.patch |   36 ++++++++++++++++++++
 fedup.spec                                         |   19 ++++++++--
 5 files changed, 117 insertions(+), 4 deletions(-)
---