Merge branch 'origin' of hirsch
authorRobert Kaiser <kairo@kairo.at>
Thu, 3 Apr 2008 00:04:11 +0000 (02:04 +0200)
committerRobert Kaiser <kairo@kairo.at>
Thu, 3 Apr 2008 00:04:11 +0000 (02:04 +0200)

Trivial merge