merge of '7d82814c0d9a56f422a652519c2811b08560b27e'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 21 Jun 2008 09:29:13 +0000 (09:29 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 21 Jun 2008 09:29:13 +0000 (09:29 +0000)
commit8aed449b475ebab8d1ac0eddd1e70cced62dd9be
tree272380538927c11971c79fb03c88ee3be5297c2f
parenta0ae14b809bed67825c7a3741f0d5673fecd11e6
parent39230785d9040115c7aad3e05ed8c9e11a87a351
Merge ... '7d82814c0d9a56f422a652519c2811b08560b27e'
     and 'f86fbd2f7f071147d458917a620d3ff66ad3141e'