merge of '964c681a84c5571ba63549014db4942cfa327c08'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 13 Jul 2008 17:50:09 +0000 (17:50 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 13 Jul 2008 17:50:09 +0000 (17:50 +0000)
commit0b3754be53b8afbe6c7aa1ca3cd11b797f07a9c3
tree41d3e350de1629a4991de5f99697fe743af7c835
parente076cde4161b37f322b3fff4e054b5c59d420ff1
parent2d444a95cec56aa08e3a2c844d168b928e088888
Merge ... '964c681a84c5571ba63549014db4942cfa327c08'
     and 'd4a8e219227447af1d7842c12983e74f8bd5107f'