Merge branch 'master' of git://chlamydia.fs.ei.tum.de/dragonfly
authorAggelos Economopoulos <aoiko@cc.ece.ntua.gr>
Thu, 7 May 2009 20:44:49 +0000 (23:44 +0300)
committerAggelos Economopoulos <aoiko@cc.ece.ntua.gr>
Thu, 7 May 2009 20:44:49 +0000 (23:44 +0300)

Trivial merge