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)
commitceb9beb6476d646012e9ba52f2a67eb0038f90ae
tree07c52d11c290ca332f9ef23ac2f35764a25d54e4
parentfcb80fdd84521a656ec4e57dde83c10c7f589182
parent7ed412e1e868f20a0e803e91e3d7e3529f61b44e
merge of 59f97700899a07187b176ccd4ee9885184f096ae
     and b1db4ad66d7affe171f6be3fc1e203540febb857