commit b502560c0197da64a6977ac6edff1ba45cb65cbf Merge: 8c6a275 0609701 Author: Dwayne Bailey <dwayne at translate.org.za> Date: Wed Aug 18 14:01:19 2010 +0200 Merge remote branch 'origin/el6/master' Conflicts: pootle.spec ---