merge of '290305d126092679b5d9b8f4f299b6dce4dd8da6'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 3 Jul 2007 19:48:28 +0000 (19:48 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 3 Jul 2007 19:48:28 +0000 (19:48 +0000)
     and 'dac58e411440987135799adb8235fe46a6d6e1c7'


Trivial merge