Automated merge with https://gss.googlecode.com/hg/
authorChristos V. Stathis <chstath@ebs.gr>
Tue, 25 Jan 2011 09:21:31 +0000 (11:21 +0200)
committerChristos V. Stathis <chstath@ebs.gr>
Tue, 25 Jan 2011 09:21:31 +0000 (11:21 +0200)

Trivial merge