Merge branch 'master' into aac
authorAndre <maan@p133.(none)>
Tue, 9 May 2006 22:41:24 +0000 (00:41 +0200)
committerAndre <maan@p133.(none)>
Tue, 9 May 2006 22:41:24 +0000 (00:41 +0200)

Trivial merge