merge of '889b38d9aefee8fdff26966f3716f5e5a12ac8be'
authorHolger Freyther <zecke@selfish.org>
Sat, 11 Nov 2006 22:40:19 +0000 (22:40 +0000)
committerHolger Freyther <zecke@selfish.org>
Sat, 11 Nov 2006 22:40:19 +0000 (22:40 +0000)
commitf3088cbe5754d03762722ae4ca05de2063485864
treea00321fab6e4f6bcc767475185f43ab5bf896a36
parent8bad4242b4213a4daf61c9753e605327e41b9891
parentfd6b7558b3d515b25dd500293aee347bcbc38039
Merge ... '889b38d9aefee8fdff26966f3716f5e5a12ac8be'
     and 'c370f7ef14194698681f362610060c2a106412ac'