[rpmconf/el6: 11/11] Merge remote-tracking branch 'origin/master' into el6

[Miroslav Suchý]

commit 9e98a802462db0edb3654bc94dc3bb9ee4d61dd2
Merge: 9bd7a98 349e904
Author: Miroslav Suchý <msuchy at redhat.com>
Date:   Mon Jul 11 20:41:36 2011 +0200

    Merge remote-tracking branch 'origin/master' into el6
    
    Conflicts:
    	.gitignore

 rpmconf.spec |   37 +++++++++++++++++++++++++++++++++----
 sources      |    2 +-
 2 files changed, 34 insertions(+), 5 deletions(-)
---