merge of '13698b0155bfd84de4053760ea89c710016962d0'
authorLeon Woestenberg <leon.woestenberg@gmail.com>
Sun, 20 May 2007 18:16:25 +0000 (18:16 +0000)
committerLeon Woestenberg <leon.woestenberg@gmail.com>
Sun, 20 May 2007 18:16:25 +0000 (18:16 +0000)
     and 'f929edf173e963f92fadb3e8400f60f5254de752'


Trivial merge