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

[Christopher Meng]

commit 17f879363f63b66328afebe9658f5e7a4c41e041
Merge: 9b39b5f 97367c3
Author: Christopher Meng <rpm at cicku.me>
Date:   Sat Nov 9 14:58:19 2013 +0800

    Merge branch 'master' into el6
    
    Conflicts:
    	reposurgeon.spec

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