merge of '47d8716628e5ee3a0fef6d31d3681973db6b3804'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 7 Mar 2007 20:05:54 +0000 (20:05 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 7 Mar 2007 20:05:54 +0000 (20:05 +0000)
commit0bda94b8cbd864f065b9d0b48311f9e8a9a9cc57
tree57f7d9770346af2beec6c07c045af5f1723422f3
parent7fcce5bba7fb6b4123cdda7a282e47f0d17f2f7f
parentaea030cb0e8c112105a4093f396b192f21b43fbc
Merge ... '47d8716628e5ee3a0fef6d31d3681973db6b3804'
     and 'e90fcecaeb0ae2bcd7a98403ba936753625f59bd'