merge of 9bbf3b49428861667fd03d8e2eea47c7348e91bb
authorPhilipp Zabel <philipp.zabel@gmail.com>
Wed, 21 Sep 2005 09:06:31 +0000 (09:06 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 21 Sep 2005 09:06:31 +0000 (09:06 +0000)
commit188bfeb0e1b1cc4c505263b59bd8c56f83842efb
tree84c2b50f0cd40fd0e54f399150dfab62f66acff0
parent1b1159eb8a1f61d13c1a460a520fe484481b96cd
parent7aeb533c92164997b72187cc2f08dfb4e2503c94
merge of 9bbf3b49428861667fd03d8e2eea47c7348e91bb
     and 9cc938ac7d8bab2bd41cb94d8c11a81bfbf6dabe