merge of '61f51adb910c35364a495ee3a926fea53aad7b57'
authorKoen Kooi <koen@openembedded.org>
Thu, 16 Nov 2006 23:31:39 +0000 (23:31 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 16 Nov 2006 23:31:39 +0000 (23:31 +0000)
     and 'd843059235f472ce11d08dbb0b2d70c8f9de243b'


Trivial merge