Merge commit 'afe4982a801812db0820578451ca3b6a0433b972'
authorDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Mon, 29 Nov 2010 19:46:33 +0000 (21:46 +0200)
committerDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Mon, 29 Nov 2010 19:46:33 +0000 (21:46 +0200)

Trivial merge