merge of '445066af3cf565c9d88cd6187570272cfa926958'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 8 Aug 2007 17:06:27 +0000 (17:06 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 8 Aug 2007 17:06:27 +0000 (17:06 +0000)
commit89f4a812b9defa0977d3c2fa3416a96a2772a92b
tree48df21f21eb976a39801d2134c9eaac1015b45ef
parentf2bfdec5ff7076060a95daa21922374cfa4ef9c4
parentb6cea476b9e88669253d1e8761c8f3f118d91228
Merge ... '445066af3cf565c9d88cd6187570272cfa926958'
     and '76d3b20f964cec7e37a6e3a20c6298ed35aee629'