Merge commit 'crater/master'
authorAggelos Economopoulos <aoiko@cc.ece.ntua.gr>
Sat, 14 Nov 2009 21:03:44 +0000 (23:03 +0200)
committerAggelos Economopoulos <aoiko@cc.ece.ntua.gr>
Sat, 14 Nov 2009 21:03:44 +0000 (23:03 +0200)

Trivial merge