[pootle: 5/5] Merge remote branch 'origin/f12/master'

[dwayne]

commit 8c6a2752d763ccdcfa5a8e8efefb946b46f0c142
Merge: 75a3f56 75eb804
Author: Dwayne Bailey <dwayne at translate.org.za>
Date:   Wed Aug 18 13:59:54 2010 +0200

    Merge remote branch 'origin/f12/master'
    
    Conflicts:
    	pootle.spec

---