Automated merge with https://gss.googlecode.com/hg/
authorNatasa Kapravelou <akapravelou@gmail.com>
Mon, 28 Feb 2011 14:26:51 +0000 (16:26 +0200)
committerNatasa Kapravelou <akapravelou@gmail.com>
Mon, 28 Feb 2011 14:26:51 +0000 (16:26 +0200)

Trivial merge