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)
     and 'd911fb03b7332d3d2f9b04109ce91081f3062e71'


Trivial merge