merge of '1a4a3b2be416c7c4f63918779f9d0ee5704745df'
authorHolger Freyther <zecke@selfish.org>
Thu, 17 Aug 2006 14:51:43 +0000 (14:51 +0000)
committerHolger Freyther <zecke@selfish.org>
Thu, 17 Aug 2006 14:51:43 +0000 (14:51 +0000)
commitcf6b8bd5524c57bff10e090df71c5f229d351050
treea9161051d0aeb16f04a4748d83bb016af3290495
parenta3caba01d6da8e27cf0eef41948d0b89e71132f9
parent87f266da9cda903b845ab18941d41d6ecb98b28c
Merge ... '1a4a3b2be416c7c4f63918779f9d0ee5704745df'
     and 'cbcfc49a8bb1a943b0aa9d318c6b651da34d5c0e'