merge of 34a8195854b5fc3cb0a1dbdc076ea457055675c3
authorKoen Kooi <koen@openembedded.org>
Thu, 23 Feb 2006 09:24:02 +0000 (09:24 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 23 Feb 2006 09:24:02 +0000 (09:24 +0000)
     and d819632af79eb10795988e75753319cf42625ca0


Trivial merge