Automated merge with https://gss.googlecode.com/hg/
authorNatasa Kapravelou <akapravelou@gmail.com>
Thu, 15 Jul 2010 15:20:52 +0000 (18:20 +0300)
committerNatasa Kapravelou <akapravelou@gmail.com>
Thu, 15 Jul 2010 15:20:52 +0000 (18:20 +0300)

Trivial merge