[muse/f12/master: 13/13] Merge branch 'master' into f12

[Orcan Ogetbil]

commit fc0a9a86be673efb1f49a0495630f6b31ad42324
Merge: fe74576 355f02a
Author: Orcan Ogetbil <oget.fedora at gmail.com>
Date:   Tue Sep 28 01:44:43 2010 -0400

    Merge branch 'master' into f12
    
    Conflicts:
    	muse-x86_64-sse.patch
    	muse.spec
    	sources

 .gitignore            |    1 +
 muse-x86_64-sse.patch |    9 +++++----
 muse.spec             |   29 ++++++++++++++++++++---------
 sources               |    2 +-
 4 files changed, 27 insertions(+), 14 deletions(-)
---