merge of 'ab5ad4e59f4a6f702c25734887b847d5f8f38376'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 10 Mar 2008 16:17:04 +0000 (16:17 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 10 Mar 2008 16:17:04 +0000 (16:17 +0000)
     and 'afa1166259e2b444217408569230c95f8384ac5f'


Trivial merge