[fedora-packager/f16: 7/7] Merge branch 'master' into f16

[Jesse Keating]

commit 872002b5274984b0c7bd1fedd1fc683258b1a7ee
Merge: fb03342 8cf4e06
Author: Jesse Keating <jkeating at redhat.com>
Date:   Fri Oct 28 15:01:52 2011 -0700

    Merge branch 'master' into f16

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