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

Trivial merge