Automated merge with https://gss.googlecode.com/hg/
authorChristos V. Stathis <chstath@ebs.gr>
Fri, 21 Jan 2011 11:18:24 +0000 (13:18 +0200)
committerChristos V. Stathis <chstath@ebs.gr>
Fri, 21 Jan 2011 11:18:24 +0000 (13:18 +0200)

Trivial merge