Merge branch 'master' into aac
authorAndre <maan@p133.(none)>
Fri, 5 May 2006 12:31:24 +0000 (14:31 +0200)
committerAndre <maan@p133.(none)>
Fri, 5 May 2006 12:31:24 +0000 (14:31 +0200)

Trivial merge