Merge branch 'plugin' into domainsocket
authorChristian Garbs <mitch@cgarbs.de>
Sun, 28 Dec 2008 11:32:18 +0000 (12:32 +0100)
committerChristian Garbs <mitch@cgarbs.de>
Sun, 28 Dec 2008 11:32:18 +0000 (12:32 +0100)

Trivial merge