Merge branch 'issue124'
authorAndreas Unterkircher <unki@netshadow.at>
Sat, 7 Jun 2008 15:25:41 +0000 (17:25 +0200)
committerAndreas Unterkircher <unki@netshadow.at>
Sat, 7 Jun 2008 15:25:41 +0000 (17:25 +0200)

Trivial merge