merge of '608ac63921c4d1a58f52ff5666e33b863be0d5e2'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 14 Mar 2007 14:04:59 +0000 (14:04 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 14 Mar 2007 14:04:59 +0000 (14:04 +0000)
     and 'fbd5ff3ff37128ffc8addc9ff281a91c38bc6119'


Trivial merge