merge of 351f471d442cbf1517f5d2327e576fad094e0712
authorKoen Kooi <koen@openembedded.org>
Thu, 1 Dec 2005 17:28:52 +0000 (17:28 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 1 Dec 2005 17:28:52 +0000 (17:28 +0000)
     and 41bf7eeb45e097a83eee74d76ccbe5d4d34e7b82


Trivial merge