merge of '7a3bad457105ec40106bf5bc6341dfc5906a0088'
authorMatthias Hentges <oe@hentges.net>
Sat, 5 Jan 2008 16:45:13 +0000 (16:45 +0000)
committerMatthias Hentges <oe@hentges.net>
Sat, 5 Jan 2008 16:45:13 +0000 (16:45 +0000)
commitc8a8abcf0505228f0d50393e6e44a2dcea832b1a
tree2b547d3063e0bef631b172a3369ca1ae16b98d66
parentb3980479c23fe2a8cb24e7c2f2003d0ffa39513f
parent1281530838d3bfd8ba09e3d4ad5ecf69a7ba8239
Merge ... '7a3bad457105ec40106bf5bc6341dfc5906a0088'
     and 'a97c52f271b18a7c7146382c7acc35a108bda245'