merge of 'a40922ce4042605b9461895764c10eef9b4b88fb'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 20 Mar 2008 13:21:13 +0000 (13:21 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 20 Mar 2008 13:21:13 +0000 (13:21 +0000)
commit3f1c506d76ed55811c3dd03d445238dfe6fecc4a
tree9ab55fe3e88b02139d64a2bb956081f2e00e4d31
parent0928a0256afd553556ed0785e9d2e224de157e7d
parentc6b9e19d25e4a54fac41f01dce252f3c93fe6a6e
Merge ... 'a40922ce4042605b9461895764c10eef9b4b88fb'
     and 'de3231b226eb18eb878a1582e969819c53434e6c'