Merge with optimizations branch
authorChristos V. Stathis <chstath@ebs.gr>
Fri, 10 Dec 2010 13:10:31 +0000 (15:10 +0200)
committerChristos V. Stathis <chstath@ebs.gr>
Fri, 10 Dec 2010 13:10:31 +0000 (15:10 +0200)

Trivial merge