merge of '71838e03ecc147470b6b605de0819927c7cebc0c'
authorLeon Woestenberg <leon.woestenberg@gmail.com>
Fri, 29 Dec 2006 23:02:27 +0000 (23:02 +0000)
committerLeon Woestenberg <leon.woestenberg@gmail.com>
Fri, 29 Dec 2006 23:02:27 +0000 (23:02 +0000)
     and 'dfd0a4eedaac873d1faa67482887a8505c8214b6'


Trivial merge