merge of '9a2dacaa07f0fa0d6e2645ce797391f52e2608e1'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 6 May 2008 15:41:33 +0000 (15:41 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 6 May 2008 15:41:33 +0000 (15:41 +0000)
commit5670c7f98f471c4fa643d0b9cb64d97ac667730d
tree31e2ad414c5692e4b68116651822dcab8137bdb4
parentd434f2f9d6887f4982cc8623dae75b96a2f64189
parentb56392e07065927ba44f01c7c631fd2829ba050d
Merge ... '9a2dacaa07f0fa0d6e2645ce797391f52e2608e1'
     and 'faf8b98d3258fe272efb4ed0c6d22cd1f32c6593'