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)
     and '1dce78677871a19bf3d8f84d8376da3d368082ec'


Trivial merge