merge of 'c29c2d80a9c5a2b26cc0510f7c58f76201aaebf0'
authorMatthias Hentges <oe@hentges.net>
Wed, 22 Nov 2006 23:41:02 +0000 (23:41 +0000)
committerMatthias Hentges <oe@hentges.net>
Wed, 22 Nov 2006 23:41:02 +0000 (23:41 +0000)
commit3ecff9b21111cace7d073669bde234f68002bd94
treebbca2c08b97615063c2de88111856b0509a672de
parented3cbac197f767f226f8eb130f099f131b5f340a
parent60c2cae137da838048e25fc1778a547fd73c3e9b
Merge ... 'c29c2d80a9c5a2b26cc0510f7c58f76201aaebf0'
     and 'd911fb03b7332d3d2f9b04109ce91081f3062e71'