Merge branch 'unki'
authorAndreas Unterkircher <unki@netshadow.at>
Sat, 12 Apr 2008 16:26:40 +0000 (18:26 +0200)
committerAndreas Unterkircher <unki@netshadow.at>
Sat, 12 Apr 2008 16:26:40 +0000 (18:26 +0200)

Trivial merge