merge of '4f2b8fbe38be5a535656d7d00413d303f9a4975d'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 1 Oct 2008 18:30:22 +0000 (18:30 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 1 Oct 2008 18:30:22 +0000 (18:30 +0000)
commitaddb38f7ab4eb2e58d5253eb955129dbb97f761d
tree115866c27e609a6f4b1caa7f1f9594e63b19705c
parent33ff72afbfd5e5dc3ef4dbdff78c2dc03fbb5427
parent2a51c06c2cd87c48d1c273a8cdd53c009f57ea6d
Merge ... '4f2b8fbe38be5a535656d7d00413d303f9a4975d'
     and 'd3b1203776970588892a46acdd9df1e18c0c5d37'