merge of 'd125bf400582faeb1540478ae087da821b077b4a'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 14 Feb 2007 08:54:50 +0000 (08:54 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 14 Feb 2007 08:54:50 +0000 (08:54 +0000)
commit48ba26e56d3c198dbb6b425e6cca8de9b8fe49ad
treed7cbacfe0dd8aadfe61feb741ce05c5785ea25f4
parent1c318bb5d67b8c0ad2c9d6855f6171c28b4b4e1c
parent3278d5079ad2d86a97bb495e3c75f91494ebf690
Merge ... 'd125bf400582faeb1540478ae087da821b077b4a'
     and 'eb2aaa8111ec4c420d768c8f835d142e4dd9b68f'