[matahari/f16: 2/2] Merge branch 'master' into f16

[Adam Stokes]

commit d48bb62062f37f74b3f76ca85e562afea1a18f53
Merge: 2a9ebaf 3971253
Author: Adam Stokes <astokes at fedoraproject.org>
Date:   Fri Sep 9 10:49:59 2011 -0400

    Merge branch 'master' into f16

 .gitignore    |    1 +
 matahari.spec |   43 +++++++++++++++++++++++++++++++++++++------
 sources       |    2 +-
 3 files changed, 39 insertions(+), 7 deletions(-)
---