merge of '3c71db502f1f99ac9b5d9e0ab928273904283f4f'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 15 Sep 2008 22:02:27 +0000 (22:02 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 15 Sep 2008 22:02:27 +0000 (22:02 +0000)
commit8ba68cd0307c3029df332f01116e2e9b1b06a759
tree048b472c2ce493ba730236975cb1f58dc165c348
parent8bb41cfd20e23a14de107403d4025b5cdf1059d0
parentcce3131711bb535dc04dc47466dc4cb97ab0489a
Merge ... '3c71db502f1f99ac9b5d9e0ab928273904283f4f'
     and 'c2ccffcf8a360685e566eab3f870529066019228'