merge of '2c836c72090e9a06860096627e902f49c103f562'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 13 Nov 2007 15:33:14 +0000 (15:33 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 13 Nov 2007 15:33:14 +0000 (15:33 +0000)
     and 'cb1f215843394ab106315dede4a9d2d2adb8f45a'


Trivial merge