Merge branch 'master' into my-osx
authormaan <maan@Gumbo.local>
Thu, 13 Jul 2006 10:41:40 +0000 (12:41 +0200)
committermaan <maan@Gumbo.local>
Thu, 13 Jul 2006 10:41:40 +0000 (12:41 +0200)

Trivial merge