merge of '0a4ab83c5e46677b239452867d3205ca5843586f'
authorLeon Woestenberg <leon.woestenberg@gmail.com>
Thu, 26 Apr 2007 16:54:23 +0000 (16:54 +0000)
committerLeon Woestenberg <leon.woestenberg@gmail.com>
Thu, 26 Apr 2007 16:54:23 +0000 (16:54 +0000)
     and '6a5c817d2f11720452c0b470075091121ce6ab96'


Trivial merge