Merge commit 'clone27-scratch-1/master'
authorAggelos Economopoulos <aoiko@cc.ece.ntua.gr>
Sat, 7 Nov 2009 10:37:04 +0000 (12:37 +0200)
committerAggelos Economopoulos <aoiko@cc.ece.ntua.gr>
Sat, 7 Nov 2009 10:37:04 +0000 (12:37 +0200)

Trivial merge