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

[Adam Stokes]

commit da38aebc6796c84d24732018e96720250e99276d
Merge: d48bb62 9f398d6
Author: Adam Stokes <astokes at fedoraproject.org>
Date:   Wed Sep 14 17:00:31 2011 -0400

    Merge branch 'master' into f16

 .gitignore    |    1 +
 matahari.spec |   22 +++++++++++++++++-----
 sources       |    2 +-
 3 files changed, 19 insertions(+), 6 deletions(-)
---