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

[Nick Bebout]

commit 8629f3f1d874ccfcdea28460aef40558b369c5e0
Merge: 1f38952 09a2fac
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Mon Dec 3 20:03:01 2012 -0600

    Merge branch 'master' into f16

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