merge of '0e25c8665bca3c8d9e7c99e4432c9ce60811994c'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 4 Sep 2007 10:00:44 +0000 (10:00 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 4 Sep 2007 10:00:44 +0000 (10:00 +0000)
     and '72c178b1440b044fcf6acdbb1cd21921f80d5b9b'


Trivial merge