merge of '53fc298d41b61bb31958787f71e60f0ada0ea33d'
authorPhilipp Zabel <philipp.zabel@gmail.com>
Wed, 28 Mar 2007 15:40:45 +0000 (15:40 +0000)
committerPhilipp Zabel <philipp.zabel@gmail.com>
Wed, 28 Mar 2007 15:40:45 +0000 (15:40 +0000)
commit5b1a6c9f5b4e26ccbd401e544f973d61fc1b3eea
treea82e2149e4fec750111cfd69d43dbbf061d5f742
parentb8637ac39ef2ffdb98926f4583c0b22a56b69fef
parentcc8325b1fb8a380182d6bb2167aa116d620c4f79
Merge ... '53fc298d41b61bb31958787f71e60f0ada0ea33d'
     and '802b2506dd668da5a8ecfb587a125d087042597a'