merge of '2d48e0fc062c46f883515824089be8f20112f660'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 3 Jul 2007 16:47:46 +0000 (16:47 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 3 Jul 2007 16:47:46 +0000 (16:47 +0000)
     and 'a02852cd756c8f5d8eaccb9e4d36be9b524b0bfd'


Trivial merge