merge of '10ff7a617b3c5cbe78b0c05c1d0b09006a1c44c0'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 14 Jun 2008 09:43:50 +0000 (09:43 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 14 Jun 2008 09:43:50 +0000 (09:43 +0000)
commit3a5ff886a30a1c4a046bede899071713380c8e47
tree141b5eda6838d68d5844e2e2ae774a593a3141d4
parentd3e22b5a43ebbd20f15aadef4d2d294ad1f874b4
parent261421b2c150e2758ec6b4812c251512f4bb5895
Merge ... '10ff7a617b3c5cbe78b0c05c1d0b09006a1c44c0'
     and 'e4d84a69982a5a0ca8aec781cee663743ca6d6fc'