merge of '5e43d3e4f15cce50de048baf7164796af353cd26'
authorHolger Freyther <zecke@selfish.org>
Mon, 17 Dec 2007 18:34:31 +0000 (18:34 +0000)
committerHolger Freyther <zecke@selfish.org>
Mon, 17 Dec 2007 18:34:31 +0000 (18:34 +0000)
commitaab6b37594b71873072a1fa076ed6bea41399463
treef346285724f5f3aca3a0228660c6ae0e7af51688
parentc6fbacf61b2e7594624382f018115e929278edbd
parentd4b8505a939f85e0797074b54f104487c14006f4
Merge ... '5e43d3e4f15cce50de048baf7164796af353cd26'
     and '67b120742df5594a3735d002b5adef97a2e7811c'