merge of '1944e442d97092991784475bf4b8980e60c5c3fc'
authorKoen Kooi <koen@openembedded.org>
Tue, 2 Jan 2007 19:31:02 +0000 (19:31 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 2 Jan 2007 19:31:02 +0000 (19:31 +0000)
     and 'c6043a6be9941ce6182b30748b51b8f191e04bc8'


Trivial merge