merge of '5c05d65c9dd90a63a937c3b8da02ae5f8af28a21'
authorHolger Freyther <zecke@selfish.org>
Sun, 20 Jan 2008 11:01:00 +0000 (11:01 +0000)
committerHolger Freyther <zecke@selfish.org>
Sun, 20 Jan 2008 11:01:00 +0000 (11:01 +0000)
commit6efd9617c2a48bb6dd79ec5fb2c405f769a700d9
tree8c13ff8906e02bb117b7a40977529c8f27c02f44
parentb46f9164284b0cd6196d9bece226f5cf7705de1e
parent0e13705ef8de52c8de69c26025faecb9c03dd0da
Merge ... '5c05d65c9dd90a63a937c3b8da02ae5f8af28a21'
     and 'd1820625c87154f827396b5afbc6cac762157b01'