Merge branch 'master' of hackdaworld.org:/chroot/git/my-code/arm
authorhackbard <hackbard@sage.physik.uni-augsburg.de>
Thu, 13 Sep 2007 11:51:39 +0000 (13:51 +0200)
committerhackbard <hackbard@sage.physik.uni-augsburg.de>
Thu, 13 Sep 2007 11:51:39 +0000 (13:51 +0200)

Trivial merge