merge of 186f778d1d10c9a87957e79c704e1336f936d92c
authorKoen Kooi <koen@openembedded.org>
Sun, 1 Jan 2006 15:23:21 +0000 (15:23 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 1 Jan 2006 15:23:21 +0000 (15:23 +0000)
     and 9dd1ab5bac61847d1fe071f6cc0431ca2e4fe94f


Trivial merge