merge of 6b93ecbe268d25fd1431774e86d13249d43b909c
authorErik Hovland <erik@hovland.org>
Mon, 22 May 2006 19:05:24 +0000 (19:05 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 22 May 2006 19:05:24 +0000 (19:05 +0000)
     and baa8f71c79346cb61aec79abc76df5849f08e76f


Trivial merge