merge of '1ca0ede88a8098bb5aecc096c437b17e3779239a'
authorLeon Woestenberg <leon.woestenberg@gmail.com>
Thu, 17 May 2007 16:32:37 +0000 (16:32 +0000)
committerLeon Woestenberg <leon.woestenberg@gmail.com>
Thu, 17 May 2007 16:32:37 +0000 (16:32 +0000)
     and '1d3cbf1f69da57387c0d0eb4329fc5054a9ccec0'


Trivial merge