merge of 'aac60b186b977130a688c4d00bfde913fb6221eb'
authorLeon Woestenberg <leon.woestenberg@gmail.com>
Fri, 5 Oct 2007 12:43:03 +0000 (12:43 +0000)
committerLeon Woestenberg <leon.woestenberg@gmail.com>
Fri, 5 Oct 2007 12:43:03 +0000 (12:43 +0000)
     and 'f42403739ba7106ebfe92b3af59bf9c81b54f06d'


Trivial merge