merge of 85ab954bb82c2414794b5e63feca7970416e1156
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 28 Jul 2005 14:19:36 +0000 (14:19 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 28 Jul 2005 14:19:36 +0000 (14:19 +0000)
     and e91215dbe7d81225280dbae31ec4d29630f67f58


Trivial merge