Automated merge with https://gss.googlecode.com/hg/
authorNatasa Kapravelou <akapravelou@gmail.com>
Fri, 25 Feb 2011 16:24:39 +0000 (18:24 +0200)
committerNatasa Kapravelou <akapravelou@gmail.com>
Fri, 25 Feb 2011 16:24:39 +0000 (18:24 +0200)

Trivial merge