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

Trivial merge