merge of '1897dabec68161c37cd3543ac7f113e99557ec54'
authorLeon Woestenberg <leon.woestenberg@gmail.com>
Mon, 1 Jan 2007 23:59:20 +0000 (23:59 +0000)
committerLeon Woestenberg <leon.woestenberg@gmail.com>
Mon, 1 Jan 2007 23:59:20 +0000 (23:59 +0000)
     and 'd0e7b7f2c99a7d43f5de13d839883dcca9d52dae'


Trivial merge