merge of 945d26824bc94348e306d9812e110b32ec79fcd9
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sat, 3 Sep 2005 14:22:00 +0000 (14:22 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 3 Sep 2005 14:22:00 +0000 (14:22 +0000)
     and cbbc5114b1d187a53a4373cf2183c825d68cd1eb


Trivial merge