merge of '1ee552cc6f52635092d975d976326b9977dfc32e'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 29 Aug 2008 23:57:44 +0000 (23:57 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 29 Aug 2008 23:57:44 +0000 (23:57 +0000)
commit8ef4cbc3c4a3ff46a2c05c13da7aefea143d938e
tree60bb69fefe0b152cd3fcbd1c3eb25e764f501107
parentf60c132ca66cc96dde01e0622af2dd319c2aa52b
parent9aabad5771b24f0da302faf9f396d73dd7166d30
Merge ... '1ee552cc6f52635092d975d976326b9977dfc32e'
     and '42b443ef8580ee734b2f0f0401489eef57a70a16'