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

[Adam Stokes]

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

    Merge branch 'master' into f15

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