merge of '30b35d26d67618622ba1fd8fffabd5be4d9508a4'
authorPhilipp Zabel <philipp.zabel@gmail.com>
Mon, 24 Sep 2007 10:50:27 +0000 (10:50 +0000)
committerPhilipp Zabel <philipp.zabel@gmail.com>
Mon, 24 Sep 2007 10:50:27 +0000 (10:50 +0000)
commit4835074a856d36e7ad237b1c064e476a4dbfc35a
tree955d0f55e165c8322fc79004ed09b0921f8cc99b
parent44db427349cb05a96d204f4fa0b41503b3181fef
parent566356001d5aaa2a4d88cb9359d17d040ef51d57
Merge ... '30b35d26d67618622ba1fd8fffabd5be4d9508a4'
     and '51bb8f349026919119902bbef09d2df9b50512fa'