merge of 'b7543cd2dc462a6eac2d07da5b8a046d889abacb'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 17 Jan 2007 20:38:02 +0000 (20:38 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 17 Jan 2007 20:38:02 +0000 (20:38 +0000)
     and 'cc2d03ff9706820f2a9118101188cf7e270a188e'


Trivial merge