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

[Adam Stokes]

commit 13dacfefca7844c3d1ddc8b2588140699b8824ad
Merge: 93fd4e9 6afd58c
Author: Adam Stokes <astokes at fedoraproject.org>
Date:   Fri Oct 21 12:16:04 2011 -0400

    Merge branch 'master' into f16

 .gitignore    |    1 +
 matahari.spec |  326 ++++++++++++++++++++++++++++++++++++++++-----------------
 sources       |    2 +-
 3 files changed, 233 insertions(+), 96 deletions(-)
---