merge of '56ceab0da14ebf9acac5e367a5e2300e7da4882f'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 25 Oct 2007 12:48:48 +0000 (12:48 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 25 Oct 2007 12:48:48 +0000 (12:48 +0000)
     and '9235652d1f961fc07ff7bc1997a38323e8c46039'


Trivial merge