[mediawiki/f12/master: 9/9] Merge branch 'master' into f12

[Nick Bebout]

commit f35ee1f66f0b1601bf29575d89a713938d6746bc
Merge: be8d867 f8d8f99
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Fri Sep 10 23:17:01 2010 -0400

    Merge branch 'master' into f12
    
    Conflicts:
    	mediawiki.spec

 mediawiki.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---