Merge commit 'origin/master'
authorslack <slack@ommadawn.(none)>
Sun, 22 Jun 2008 13:51:34 +0000 (15:51 +0200)
committerslack <slack@ommadawn.(none)>
Sun, 22 Jun 2008 13:51:34 +0000 (15:51 +0200)

Trivial merge