merge of '152391f4367c4184f3b73eb8fa296c0a57a369b5'
authorStefan Schmidt <stefan@datenfreihafen.org>
Fri, 12 Oct 2007 08:06:50 +0000 (08:06 +0000)
committerStefan Schmidt <stefan@datenfreihafen.org>
Fri, 12 Oct 2007 08:06:50 +0000 (08:06 +0000)
     and 'e566511379769e8eab7adb0ceb1768a5177618bb'


Trivial merge