merge of 1ac9a4a5dc21044643760bdc04d49ea3b67e2fe9
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 13 Jan 2006 12:32:19 +0000 (12:32 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 13 Jan 2006 12:32:19 +0000 (12:32 +0000)
commitd3db6716cb221a16011af6f6d40c6ae17c766990
tree56c5d96aea842f0fc22c689dc88c8af0a8ac584e
parent45a709c1f8d299931639ee1669a54fe9ecfe71e6
parenta63b0256a83eed2b1e6377764fb3e68ec5adfd19
merge of 1ac9a4a5dc21044643760bdc04d49ea3b67e2fe9
     and 89b50baece913cead5c49dc80063b2541dcad4cd