merge of e1fa4ab4db4576d220e90fd564d67769403c4742
authorKoen Kooi <koen@openembedded.org>
Mon, 8 May 2006 12:40:03 +0000 (12:40 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 8 May 2006 12:40:03 +0000 (12:40 +0000)
     and ffddb058a7721edecad6b2a9d4d77ea9e2035e81


Trivial merge