merge of '5259dfab416d5f0ea53cc4ad85ec7445cd760e9c'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 11 Jun 2007 15:36:16 +0000 (15:36 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 11 Jun 2007 15:36:16 +0000 (15:36 +0000)
     and 'f8984ff1139f0fee1957bc41b210b2b92b40b6a4'


Trivial merge