merge of '3ab428305dc18f68841dc14cd439d1a848cf72d8'
authorKoen Kooi <koen@openembedded.org>
Wed, 30 May 2007 15:21:12 +0000 (15:21 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 30 May 2007 15:21:12 +0000 (15:21 +0000)
     and '5d75706a2aa33529b13e82265554be6e85525ea8'


Trivial merge