merge of 8475cec92c101b0acaa9de1282132ab4c0474027
authorCliff Brake <cbrake@bec-systems.com>
Thu, 8 Jun 2006 17:23:35 +0000 (17:23 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 8 Jun 2006 17:23:35 +0000 (17:23 +0000)
     and d103331f64361bb9b0fc1f40d188c2161d90831d


Trivial merge