Merge branch 'master' of git+ssh://git@linbsd.net/projs/catalyst
authorRobin H. Johnson <robbat2@gentoo.org>
Mon, 29 Jun 2009 00:07:50 +0000 (17:07 -0700)
committerRobin H. Johnson <robbat2@gentoo.org>
Mon, 29 Jun 2009 00:07:50 +0000 (17:07 -0700)

Trivial merge