merge of '47c30ebda2c1ad0df303493ea5a7b149455d8202'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 3 Oct 2007 06:52:56 +0000 (06:52 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 3 Oct 2007 06:52:56 +0000 (06:52 +0000)
commitd1ffce46e6622c08c9c7f4fc498ed8844f61077f
tree02f3c9d4f786a92f722eb3b69702e38daa1cc840
parent3e459b87c6d590a60db1a7b110177011913ee736
parent7c18debc66db5e4bca03d28246547ef30d838875
Merge ... '47c30ebda2c1ad0df303493ea5a7b149455d8202'
     and '49ebc80978a5a98291bc76a35b098b6ef4e9d24d'