Merge branch 'master' of hackdaworld.org:/chroot/git/my-code/arm
authorhackbard <hackbard@staubsauger.localdomain>
Wed, 8 Aug 2007 01:40:00 +0000 (03:40 +0200)
committerhackbard <hackbard@staubsauger.localdomain>
Wed, 8 Aug 2007 01:40:00 +0000 (03:40 +0200)

Trivial merge