merge of 28158d679a65dc8b24fcdb891cf73aa3981add9a
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sat, 8 Jul 2006 18:51:38 +0000 (18:51 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 8 Jul 2006 18:51:38 +0000 (18:51 +0000)
     and acafceaa6274c3052621ed2a6eb47f89e7c7ee75


Trivial merge