merge of '65710bca464cc1c83f13f67af1f184e2dd527e19'
authorMatthias Hentges <oe@hentges.net>
Thu, 24 May 2007 17:13:15 +0000 (17:13 +0000)
committerMatthias Hentges <oe@hentges.net>
Thu, 24 May 2007 17:13:15 +0000 (17:13 +0000)
commit1c6e2c60fd35e5272298c62fb9e9fa5c13aa9806
tree6b255387649841606b5666eadc356e15c4626a03
parentbc7ef036b41bbd8ea4fd17196ed21e3434621ccd
parentb21741e8b47255b19fcf81dd9acfaf7f7f2c7053
Merge ... '65710bca464cc1c83f13f67af1f184e2dd527e19'
     and '6de428a857bac350bf056ed06d55fadf87e2506d'