merge of '1dab1e878846ddfdd02a4299ee92d3bab84010ea'
authorLeon Woestenberg <leon.woestenberg@gmail.com>
Tue, 2 Jan 2007 00:05:26 +0000 (00:05 +0000)
committerLeon Woestenberg <leon.woestenberg@gmail.com>
Tue, 2 Jan 2007 00:05:26 +0000 (00:05 +0000)
     and 'eb58185a37d3e4750c282c90f9316c932596773d'


Trivial merge