merge of '66901d5eabd98c5f7c2f9cdf809e9fe7f182f1ef'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 25 Jul 2008 11:51:44 +0000 (11:51 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 25 Jul 2008 11:51:44 +0000 (11:51 +0000)
commit61b8fecfd244e7d73491b2558dede15f8541fa79
tree88282ba73f7028e24e1e483c40ace808938a2840
parenta0a8127e2c74b23889e63ad749f8d9949f1fca2b
parentab20a91f2bc091bd101383fc35f12e29382a5b7d
Merge ... '66901d5eabd98c5f7c2f9cdf809e9fe7f182f1ef'
     and '8a68b62f9b7e2ae09097a8b9390d75dbcfc1ca82'