merge of '283054912f3356d2c4ff5789698b6e711bf35c43'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 18 Apr 2008 12:58:10 +0000 (12:58 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 18 Apr 2008 12:58:10 +0000 (12:58 +0000)
commita386f6d6ec2a075b802bde9c181c31cf1adf86b2
tree686033d5732e1a1bfb95d34aeaa6df48cacfb200
parentc5c7189c245d5dee517f4acd8571fffe0e6e2979
parent5aad6cee7f6d48b568a0cc4d3ae9721970ea4f23
Merge ... '283054912f3356d2c4ff5789698b6e711bf35c43'
     and 'd8895e78d633e44885169498f3566ac510d55c97'