merge of '04cd7b14ad574131ab6b03984f2d0bd53c6f19fc'
authorHolger Freyther <zecke@selfish.org>
Sun, 17 Sep 2006 19:35:18 +0000 (19:35 +0000)
committerHolger Freyther <zecke@selfish.org>
Sun, 17 Sep 2006 19:35:18 +0000 (19:35 +0000)
commit777d2da978682d5391fe35f48755b80340e0600e
tree20490de2abb48d40f2520a735ee35be79121b277
parent71f49d707bdbf9c4a1cedbea0e849271b5c7c214
parent41755fb3756a95642b14f560b889a0add9ddd7a2
Merge ... '04cd7b14ad574131ab6b03984f2d0bd53c6f19fc'
     and '6388d23a0add65b7d813d1ac18c8befec1913226'