Merge commit 'c17595732d148368deca598f3a5c073e3022592b'
authorDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Sun, 12 Dec 2010 19:41:48 +0000 (21:41 +0200)
committerDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Sun, 12 Dec 2010 19:41:48 +0000 (21:41 +0200)

Trivial merge