Merge branch 'master' into aac
authorAndre <maan@p133.(none)>
Fri, 12 May 2006 15:00:10 +0000 (17:00 +0200)
committerAndre <maan@p133.(none)>
Fri, 12 May 2006 15:00:10 +0000 (17:00 +0200)
Conflicts:

Makefile.in

Makefile.in looks fine. WTF is git complaining about?


Trivial merge