[reposurgeon/f19: 2/2] Merge branch 'master' into f19

[Christopher Meng]

commit 619aabcfc8e5c2c3d0c7d6429efc09b6e40f3808
Merge: 40348f4 97367c3
Author: Christopher Meng <rpm at cicku.me>
Date:   Sat Nov 9 14:57:34 2013 +0800

    Merge branch 'master' into f19

 .gitignore       |    1 +
 reposurgeon.spec |   29 ++++++++++++++++-------------
 sources          |    2 +-
 3 files changed, 18 insertions(+), 14 deletions(-)
---