[slv2/f13/master: 4/4] Merge branch 'master' into f13

[Orcan Ogetbil]

commit b5c9a87fbce37fdd751e4c710a7d7e89baa25cbc
Merge: 9463d70 83489e0
Author: Orcan Ogetbil <oget.fedora at gmail.com>
Date:   Tue Jan 4 22:29:56 2011 -0500

    Merge branch 'master' into f13
    
    Conflicts:
    	slv2.spec

 slv2.spec |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
---