Automated merge with https://gss.googlecode.com/hg/
authorChristos V. Stathis <chstath@ebs.gr>
Thu, 31 Mar 2011 14:37:45 +0000 (17:37 +0300)
committerChristos V. Stathis <chstath@ebs.gr>
Thu, 31 Mar 2011 14:37:45 +0000 (17:37 +0300)

Trivial merge