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

[Jesse Keating]

commit 9db4133267cbbc1e854f4e9592e3cd58cca18589
Merge: 2b3f392 7cae2c6
Author: Jesse Keating <jkeating at redhat.com>
Date:   Mon Jan 31 12:36:16 2011 -0700

    Merge branch 'master' into el6

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