Merge branch 'master' into aac
authorAndre <maan@p133.(none)>
Sat, 6 May 2006 18:25:07 +0000 (20:25 +0200)
committerAndre <maan@p133.(none)>
Sat, 6 May 2006 18:25:07 +0000 (20:25 +0200)

Trivial merge