merge of '4e3569a19b8a6f85c3878f45db976a5ef67711f2'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 18 Jun 2008 15:43:44 +0000 (15:43 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 18 Jun 2008 15:43:44 +0000 (15:43 +0000)
commit231dec46ce70357bf8ab2f75a75821703bc8616b
tree31f1b9fb2ffe08b7de0197fadf9f08c871fd5586
parent97470a03ce59301e4ddfca93af76adcc49efad4d
parent63f3f37555e41ddf4aae399f61911423827bff8b
Merge ... '4e3569a19b8a6f85c3878f45db976a5ef67711f2'
     and 'b6c9567e6cd15dcc0358bab7cdc8c5d45cc4d0c4'