Merge branch 'master' of wien.tomnetworks.com:mate
authorHarald Steinlechner <haraldsteinlechner@gmail.com>
Thu, 22 Mar 2012 15:44:25 +0000 (16:44 +0100)
committerHarald Steinlechner <haraldsteinlechner@gmail.com>
Thu, 22 Mar 2012 15:44:25 +0000 (16:44 +0100)

Trivial merge