Merge commit 'origin/master'
authorAndreas Unterkircher <unki@netshadow.at>
Sun, 25 May 2008 08:31:19 +0000 (10:31 +0200)
committerAndreas Unterkircher <unki@netshadow.at>
Sun, 25 May 2008 08:31:19 +0000 (10:31 +0200)

Trivial merge