merge of '594502154668fa56bb9d345ec049a78e7e0e759c'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 27 Jun 2008 16:57:37 +0000 (16:57 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 27 Jun 2008 16:57:37 +0000 (16:57 +0000)
commitdff45e71074cbb4e08a48d6b6ffd7a244c5d66e3
tree7160b35e6935cb85f8cf2759a38e9f6853c44188
parent2dec2fb72fd18b58d6425f0f51b90ced8ba03f8b
parent6c220ebea3e567aa94cdf41fa309ebdcd4e32dbd
Merge ... '594502154668fa56bb9d345ec049a78e7e0e759c'
     and '6acddf364e7286f03e9e90e9d79ea91cfff7b282'