merge of 134275ac8282e85c0c6a9e535657f513f7f039c0
authorKoen Kooi <koen@openembedded.org>
Mon, 28 Nov 2005 21:10:55 +0000 (21:10 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 28 Nov 2005 21:10:55 +0000 (21:10 +0000)
     and 9afd2dba8f4f062cb27df95849c47aa62f3441dc


Trivial merge