merge of '5c1e015a9c8350e90d5a8cdbbb18c5aa06c26f3e'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 20 Jun 2007 16:33:12 +0000 (16:33 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 20 Jun 2007 16:33:12 +0000 (16:33 +0000)
commitf031f04c2bd7ebceeff316c4b0db5a6c5a22a91e
tree1b41b8437d36d9b98e5447ee258f63bb8404c6bd
parent41efe7c2f1f2aa740512d5e011a729ea54050b90
parent6e88be3f9a9b1f633e607823b6386591333e7533
Merge ... '5c1e015a9c8350e90d5a8cdbbb18c5aa06c26f3e'
     and 'a88acd45090c2f3297309c6d5f9fcde199868e11'