merge of 9493767780c108c1eb032fd49a0a9898244577b9
authorFlorian Boor <florian.boor@kernelconcepts.de>
Sun, 3 Jul 2005 17:06:08 +0000 (17:06 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 3 Jul 2005 17:06:08 +0000 (17:06 +0000)
commit40d70c5fc78f511b4c6f71b78ba9fce8d3ad09aa
tree0ebe025920e1d0ef8d72fbb398fee077c94df219
parentaeb5ed98c3ac001cae473a071e5409a903bb281f
parenta1ce802b1a54b39ec373c6aa2c3eba0d2acabdd3
merge of 9493767780c108c1eb032fd49a0a9898244577b9
     and c82bfc5b903cf0dade276c5bd6e1312736edeece