merge of '45bac0f69c12d8a3598b9178c26d8ed103e60bc7'
authorPhilipp Zabel <philipp.zabel@gmail.com>
Tue, 22 Aug 2006 11:08:33 +0000 (11:08 +0000)
committerPhilipp Zabel <philipp.zabel@gmail.com>
Tue, 22 Aug 2006 11:08:33 +0000 (11:08 +0000)
commitac916651b26667327d7f78e33801cbd4e6bff8ed
tree13a8a3811b18d44ccdf8e638aed2d05471d227e6
parent5da68c2ea813c62978286f7f0df58a927448ff35
parent14ef0be15b166f8fcce1c6e54ce9d6dedbecf442
Merge ... '45bac0f69c12d8a3598b9178c26d8ed103e60bc7'
     and 'bb05117c7225627eddadd5005388bf209a7d68d8'