Automated merge with https://flies.googlecode.com/hg/
Automated merge with https://flies.googlecode.com/hg/

zanata/zanata-platform,zanata/zanata-platform,zanata/zanata-platform,zanata/zanata-platform,zanata/zanata-platform,zanata/zanata-platform,zanata/zanata-platform