Merge branch 'stable' into stable-master-merge
authorKarl Hasselström <kha@treskal.com>
Sun, 29 Jun 2008 22:47:50 +0000 (00:47 +0200)
committerKarl Hasselström <kha@treskal.com>
Sun, 29 Jun 2008 22:47:50 +0000 (00:47 +0200)

Trivial merge