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)
commitfc0711ae1805e4cf8654de0cf8d48b2389990526
tree3cd901e92e11c88345e798184a54577f2887b330
parent70d578e6693b2713c6e5b31b4e4b318c419e505a
parent5df2eacd530758fbd5cca526f606d2e95417c0ed
merge of 6b93ecbe268d25fd1431774e86d13249d43b909c
     and baa8f71c79346cb61aec79abc76df5849f08e76f