Merge branch 'master' into htmlfix
authorAndreas Unterkircher <unki@netshadow.at>
Tue, 20 May 2008 19:44:24 +0000 (21:44 +0200)
committerAndreas Unterkircher <unki@netshadow.at>
Tue, 20 May 2008 19:44:24 +0000 (21:44 +0200)

Trivial merge