[fedora-packager/el6/master: 18/18] Merge branch 'master' into el6

[Dennis Gilmore]

commit f8629836da382c860b39905df732fe1739ac1da2
Merge: 0c3b6c5 8415c56
Author: Dennis Gilmore <dennis at ausil.us>
Date:   Thu Aug 12 13:33:19 2010 -0500

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	fedora-packager.spec
    	sources

 .gitignore           |    1 +
 fedora-packager.spec |    6 +++++-
 sources              |    2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)
---