Merge branch 'master' of git://chlamydia.fs.ei.tum.de/dragonfly
authorAggelos Economopoulos <aoiko@cc.ece.ntua.gr>
Sat, 7 Nov 2009 18:52:22 +0000 (20:52 +0200)
committerAggelos Economopoulos <aoiko@cc.ece.ntua.gr>
Sat, 7 Nov 2009 18:52:22 +0000 (20:52 +0200)

Trivial merge