Merge commit 'clone27-scratch-2/master'
authorAggelos Economopoulos <aoiko@cc.ece.ntua.gr>
Sat, 7 Nov 2009 18:54:52 +0000 (20:54 +0200)
committerAggelos Economopoulos <aoiko@cc.ece.ntua.gr>
Sat, 7 Nov 2009 18:54:52 +0000 (20:54 +0200)

Trivial merge