Merge branch 'master' into my-osx
authormaan <maan@Gumbo.local>
Thu, 8 Jun 2006 16:45:58 +0000 (18:45 +0200)
committermaan <maan@Gumbo.local>
Thu, 8 Jun 2006 16:45:58 +0000 (18:45 +0200)

Trivial merge