Merge branch 'friendlyurl'
authorAndreas Unterkircher <unki@netshadow.at>
Tue, 13 May 2008 17:33:09 +0000 (19:33 +0200)
committerAndreas Unterkircher <unki@netshadow.at>
Tue, 13 May 2008 17:33:09 +0000 (19:33 +0200)

Trivial merge