[matahari/f14: 8/8] - Merge from master

[Adam Stokes]

commit 6b37af7b6ab05a97568e488e6a89f01c65c0bdd9
Merge: ba46fa9 9232b00
Author: Adam Stokes <astokes at fedoraproject.org>
Date:   Tue Jun 7 14:19:46 2011 -0400

    - Merge from master

 .gitignore              |    2 +
 matahari-lsb.patch      |   19 +++
 matahari-no-qpidd.patch |   40 ++++++
 matahari-qmf-lib.patch  |   50 ++++++++
 matahari.spec           |  306 ++++++++++++++++++++++++++++++++++++++++-------
 sources                 |    2 +-
 6 files changed, 375 insertions(+), 44 deletions(-)
---