Merge with d69ef17183c6
authorChristos V. Stathis <chstath@ebs.gr>
Thu, 10 Feb 2011 13:58:31 +0000 (15:58 +0200)
committerChristos V. Stathis <chstath@ebs.gr>
Thu, 10 Feb 2011 13:58:31 +0000 (15:58 +0200)

Trivial merge