merge of '4e163b633216723377aa90e615e80915ff1c78df'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 12 Sep 2006 17:02:44 +0000 (17:02 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 12 Sep 2006 17:02:44 +0000 (17:02 +0000)
     and 'd54f42654eeb09635541659baf2e2803b3b1de4e'


Trivial merge