merge of a818dc636cf9c113650aea6ea99075dc8cedaff0
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 20 Dec 2005 12:26:01 +0000 (12:26 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 20 Dec 2005 12:26:01 +0000 (12:26 +0000)
     and fa51703129c94d391a49cd73b3663c986c5c7314


Trivial merge