merge of 59f97700899a07187b176ccd4ee9885184f096ae
authorErik Hovland <erik@hovland.org>
Mon, 8 May 2006 19:19:53 +0000 (19:19 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 8 May 2006 19:19:53 +0000 (19:19 +0000)
     and b1db4ad66d7affe171f6be3fc1e203540febb857


Trivial merge