merge of 'a064aed240de1f35562230be92d3fcca8737b1f7'
authorLeon Woestenberg <leon.woestenberg@gmail.com>
Sun, 13 May 2007 16:28:23 +0000 (16:28 +0000)
committerLeon Woestenberg <leon.woestenberg@gmail.com>
Sun, 13 May 2007 16:28:23 +0000 (16:28 +0000)
     and 'd48424df9926e99b728ea6dc1368cc414f09559c'


Trivial merge