merge of '4775c58714baf936cab4e2cb0e464e1fb7dd1a73'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 2 May 2007 08:33:40 +0000 (08:33 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 2 May 2007 08:33:40 +0000 (08:33 +0000)
     and '4c02388e21857424fa81992ad328d0704f8eee9c'


Trivial merge