Merge branch 'master' of wien.tomnetworks.com:hwmod
authorfabb <Administrator@WandTeppich.(none)>
Mon, 22 Mar 2010 19:18:27 +0000 (20:18 +0100)
committerfabb <Administrator@WandTeppich.(none)>
Mon, 22 Mar 2010 19:18:27 +0000 (20:18 +0100)

Trivial merge