merge of 'abb30fd9e16aeb04aa9b9ec2dc5e3334abbcd527'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 17 Dec 2007 21:25:30 +0000 (21:25 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 17 Dec 2007 21:25:30 +0000 (21:25 +0000)
commitd5ba44aec1dd538a669c1efff72e8dc619e6d0db
tree806513f9e3bfe60bdc16dd00dd9c2a4a82d682f1
parentdd4f003103033e9e0813627bcae89a5866d95bdc
parent50e0636adc6a88aba578524dfcbd6364e7f8eb93
Merge ... 'abb30fd9e16aeb04aa9b9ec2dc5e3334abbcd527'
     and 'db54ef97e73876a8f1a87b94c3ccfb09ea36239e'