Merge branch 'lefant'
authorAndreas Unterkircher <unki@netshadow.at>
Sat, 12 Apr 2008 10:12:35 +0000 (12:12 +0200)
committerAndreas Unterkircher <unki@netshadow.at>
Sat, 12 Apr 2008 10:12:35 +0000 (12:12 +0200)

Trivial merge