merge of '0f71fa3d11b92ce6173ba2ed5c99235de2f4f336'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 2 Mar 2007 21:04:37 +0000 (21:04 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 2 Mar 2007 21:04:37 +0000 (21:04 +0000)
     and '224b2627ae546c41a7f4d0e2b52fd423add29479'


Trivial merge