merge of '5e862ccc5f65ba4b2947b0c3a5c0f84596b9fd8f'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 10 Dec 2007 11:52:03 +0000 (11:52 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 10 Dec 2007 11:52:03 +0000 (11:52 +0000)
     and 'b9d72c3b2667d036ca41078c8c8f39cdccf8ee69'


Trivial merge