Merge with fb4f6b87b576c0adf49a83ca6285a89f6154709c
authorDimitris Routsis <droutsis@ebs.gr>
Fri, 3 Jul 2009 11:42:05 +0000 (14:42 +0300)
committerDimitris Routsis <droutsis@ebs.gr>
Fri, 3 Jul 2009 11:42:05 +0000 (14:42 +0300)

Trivial merge