merge of 0619253ce15b0299b9eff713880777d377f81ae3
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 20 Dec 2005 13:00:25 +0000 (13:00 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 20 Dec 2005 13:00:25 +0000 (13:00 +0000)
     and ccb3dc111263f75629bd4f8b336de3f38642b8dc


Trivial merge