merge of 2d36b229116ed3b36fa7bf9adf431fba21eb82ac
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 10 Jul 2006 21:48:47 +0000 (21:48 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 10 Jul 2006 21:48:47 +0000 (21:48 +0000)
commit7966da3937b1771701505bfd7aa4e48a3d17ce9d
tree94e907a1694f2d36dbe20e2d4876f43e72398ab1
parent60551b5280f2ebe8e80f629875f5226f8466a17b
parent81d4cee15e8196bb27964c0ebd0949851655bbed
merge of 2d36b229116ed3b36fa7bf9adf431fba21eb82ac
     and a347a1a83513787a3f720ebff3e3e4014caf7879