Merge branch 'devel'
authorAndreas Unterkircher <unki@netshadow.at>
Sun, 20 Jan 2008 15:52:59 +0000 (16:52 +0100)
committerAndreas Unterkircher <unki@netshadow.at>
Sun, 20 Jan 2008 15:52:59 +0000 (16:52 +0100)

Trivial merge