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)
commitf5bdd34e306db20fe744dbf9634e297afa8a3480
tree0cb06dd158b630b6aa1b4c2b5c19cc1c7eb80797
parent4d217d18f5c11e9f5ec66c4037aa3d161956140c
parenta4cef58d43b3733a4a513e550b94d8713ee56401
Merge ... '7cd8f588a839cdf3733e1712ce77ad9483fb8a5c'
     and 'd92fd0f199ef1e65543bc5f96bbd038d21d71169'