Merge commit 'origin/master'
authorAndreas Unterkircher <unki@netshadow.at>
Sun, 27 Apr 2008 12:20:55 +0000 (14:20 +0200)
committerAndreas Unterkircher <unki@netshadow.at>
Sun, 27 Apr 2008 12:20:55 +0000 (14:20 +0200)

Trivial merge