merge of 'ab20bf4ac663aeb2ac1f0fd51955d412dabfe7c5'
authorKoen Kooi <koen@openembedded.org>
Fri, 4 Aug 2006 14:39:41 +0000 (14:39 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 4 Aug 2006 14:39:41 +0000 (14:39 +0000)
     and 'da07e320252fd12c19a05134932a5efed8d160d5'


Trivial merge