[mediawiki/f13/master: 8/8] Merge branch 'master' into f13

[Nick Bebout]

commit 404c2d49abdcc67712ddeeba30b09eff7e32c80c
Merge: 1d469df f8d8f99
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Fri Sep 10 23:14:05 2010 -0400

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

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