merge of 7b6a90f4a303bd10227810719197dec0ab049efe
authorMike Westerhof <mwester@dls.net>
Thu, 30 Mar 2006 15:40:42 +0000 (15:40 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 30 Mar 2006 15:40:42 +0000 (15:40 +0000)
     and fb0a7d68e12187b6fa7e65a6685bd6a7244b9484


Trivial merge