merge of 'ae5744fa10248e83339259dfc0764f954c5b3456'
authorLeon Woestenberg <leon.woestenberg@gmail.com>
Thu, 16 Aug 2007 18:05:01 +0000 (18:05 +0000)
committerLeon Woestenberg <leon.woestenberg@gmail.com>
Thu, 16 Aug 2007 18:05:01 +0000 (18:05 +0000)
     and 'd2ff855675080c5ae36403d11904698712868163'


Trivial merge