merge of '7cd8f588a839cdf3733e1712ce77ad9483fb8a5c'
authorHolger Freyther <zecke@selfish.org>
Sun, 18 Feb 2007 23:15:34 +0000 (23:15 +0000)
committerHolger Freyther <zecke@selfish.org>
Sun, 18 Feb 2007 23:15:34 +0000 (23:15 +0000)
     and 'd92fd0f199ef1e65543bc5f96bbd038d21d71169'


Trivial merge