merge of '190c717fcefa9f89f739dac0295c41c977c5f2da'
authorKoen Kooi <koen@openembedded.org>
Tue, 28 Nov 2006 15:15:48 +0000 (15:15 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 28 Nov 2006 15:15:48 +0000 (15:15 +0000)
     and '1fb8812d36f505cfabe9ee2335441ada60e32f83'


Trivial merge