merge of 406934f50b9f92db47af1cb9d9777b268c5484b5
authorErik Hovland <erik@hovland.org>
Mon, 8 May 2006 18:59:10 +0000 (18:59 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 8 May 2006 18:59:10 +0000 (18:59 +0000)
commit7ed412e1e868f20a0e803e91e3d7e3529f61b44e
treee8fb8fb8ea912ff29dca4bfdc0ce0e1aca3bc0a5
parent07423bdbbb7ce2d14455d6b886d4b0156cd28a18
parent9e3e9161817697df633d46cc88f0ce9e8365c032
merge of 406934f50b9f92db47af1cb9d9777b268c5484b5
     and 6ba2bb7b7ce5ef334cf514386df28b8d6a2aad86