Merge with d1e79f3c8c8779d14ab5297049bdc0812f942654
authorFotis Stamatelopoulos <fstamatelopoulos@gmail.com>
Mon, 6 Jul 2009 14:30:38 +0000 (17:30 +0300)
committerFotis Stamatelopoulos <fstamatelopoulos@gmail.com>
Mon, 6 Jul 2009 14:30:38 +0000 (17:30 +0300)

Trivial merge