merge of '3421ff70666434c0c8110de81d4810e43ef46a69'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 25 Jul 2008 01:47:17 +0000 (01:47 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 25 Jul 2008 01:47:17 +0000 (01:47 +0000)
commit68446fb9940af94c377b2552a45d12d5e3e542e2
tree5fbed6ba6fa9730c87fce88f5f630f92e5f593e1
parent4cd01810c3a17b4d8e65383c363eb8eefbda36dc
parent3c011708443e648c0fdc52c796215266fbb95d4a
Merge ... '3421ff70666434c0c8110de81d4810e43ef46a69'
     and '7740f57201d1a3339463ab6ee1a56af6dbbd5b7a'