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)
commit38642180b0584ce0a0c654f48bf9e4dc806fe425
treef3660a870dc92d0311946ffa981479fabdcbb766
parentb0cef9887cffb8a2bf9edfd915f924a3d524ea8b
parentac24763c52746d29e474e296392a9d5a1e29fdf2
Merge ... '152391f4367c4184f3b73eb8fa296c0a57a369b5'
     and 'e566511379769e8eab7adb0ceb1768a5177618bb'