Merge branch 'master' of git://chlamydia.fs.ei.tum.de/dragonfly
authorAggelos Economopoulos <aoiko@cc.ece.ntua.gr>
Thu, 5 Feb 2009 22:33:00 +0000 (00:33 +0200)
committerAggelos Economopoulos <aoiko@cc.ece.ntua.gr>
Thu, 5 Feb 2009 22:33:00 +0000 (00:33 +0200)

Trivial merge