merge of 086eccbfe2f48acd3f73977b451e8ce001884b98
authorMichael Lauer <mickey@vanille-media.de>
Mon, 24 Apr 2006 21:45:44 +0000 (21:45 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 24 Apr 2006 21:45:44 +0000 (21:45 +0000)
commit51436cc601a5a1c9a0ee2fc3095166315919dc33
treef6b9081ad06a8e728bd6e9b0884d144a78218506
parentc09ac5ea27870470980a426e9a9733f19d7dafd0
parent74ca65b3d3574905a3bb314c96adf3c04096c3f1
merge of 086eccbfe2f48acd3f73977b451e8ce001884b98
     and c202b2641db39b482c615f965d40d02caa42c5c5