merge of '0374910c5fe1fd354aa9e6439da6223dff805082'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 29 Mar 2007 13:26:36 +0000 (13:26 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 29 Mar 2007 13:26:36 +0000 (13:26 +0000)
commitff83f7e66a26a77d79a27a2ee0c693cff35be9d5
tree84f7bbec2b5f435d895f7231c5f00ce409a2790c
parent5c164a27251aa8be7cbb8916a13919052387c3bd
parent00154e90efa8f3004a1a14fe323c3377751fb1cd
Merge ... '0374910c5fe1fd354aa9e6439da6223dff805082'
     and '1dce78677871a19bf3d8f84d8376da3d368082ec'