merge of '08a55e9ecaeb0f65d81ffeb0eaffe33ce8860584'
authorLeon Woestenberg <leon.woestenberg@gmail.com>
Thu, 18 Jan 2007 22:29:04 +0000 (22:29 +0000)
committerLeon Woestenberg <leon.woestenberg@gmail.com>
Thu, 18 Jan 2007 22:29:04 +0000 (22:29 +0000)
     and '4fa67f2a7716754339dec73a647ff4e2d7a4671f'


Trivial merge