merge of 8ccd07ecf96c1e1dae6de3e4a8b449b5ecfcfc1b
authorKoen Kooi <koen@openembedded.org>
Mon, 1 May 2006 19:52:37 +0000 (19:52 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 1 May 2006 19:52:37 +0000 (19:52 +0000)
     and fb542799a227c1e890aa0e36ec4642b6103142cf


Trivial merge