[virtaal: 12/12] Merge remote branch 'origin/el6/master'

[dwayne]

commit a1fd04b2bf60934c77d5be562d4e5edf835d63c0
Merge: 834f798 d74a8ad
Author: Dwayne Bailey <dwayne at translate.org.za>
Date:   Wed Aug 18 09:17:51 2010 +0200

    Merge remote branch 'origin/el6/master'
    
    Conflicts:
    	virtaal.spec

---