merge of 680ed6274f4c973ac350fa89a09c39128b0a2758
authorFrederic Bompart <frederic@unknown.openembedded.org>
Mon, 20 Feb 2006 14:43:35 +0000 (14:43 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 20 Feb 2006 14:43:35 +0000 (14:43 +0000)
     and aafd39c8d1b4e9183c4892194aa78c79a62bb8de


Trivial merge