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

[Adam Stokes]

commit 2a9ebaffc3c8db012944218ea8f630e1ca57ec81
Merge: a9824b5 8751037
Author: Adam Stokes <astokes at fedoraproject.org>
Date:   Mon Aug 29 12:03:28 2011 -0400

    Merge branch 'master' into f16
    
    Conflicts:
    	matahari.spec

 .gitignore    |    2 +
 matahari.spec |  150 +++++++++++++++++++++++++++++++++++----------------------
 sources       |    2 +-
 3 files changed, 96 insertions(+), 58 deletions(-)
---