merge of '907b09122e18d1c5bf7d911edc9c19d8eff6cfe4'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 2 Oct 2007 14:14:47 +0000 (14:14 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 2 Oct 2007 14:14:47 +0000 (14:14 +0000)
commit5a0f4ca1fec6af093195d0b0d2dfffb463c815ea
treec321adef102d72e0d66c5e2d4785928a45c08824
parent7a5388e17be3a3d4b3789edf8ecbd4366740f8b7
parent76fd07d9e9def4526f1fd47517e9d8822e555177
Merge ... '907b09122e18d1c5bf7d911edc9c19d8eff6cfe4'
     and '9f9ee853372a36ca4890047d0472edcab6e5c2f3'