Merge branch 'master' of wien.tomnetworks.com:mate
authorHarald Steinlechner <haraldsteinlechner@gmail.com>
Tue, 17 Apr 2012 11:58:57 +0000 (13:58 +0200)
committerHarald Steinlechner <haraldsteinlechner@gmail.com>
Tue, 17 Apr 2012 11:58:57 +0000 (13:58 +0200)

Trivial merge