merge of '1a0381ff4565808f58609382d1280e18d59ded7f'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 4 Jul 2008 13:56:57 +0000 (13:56 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 4 Jul 2008 13:56:57 +0000 (13:56 +0000)
commit8ab6d2ddbc526acc395ddc6725067b8d74af40c0
tree5d4dd8c9ff7de71e4d4e2eea7ac78ea6c72bbe1f
parentd63780b41e9b5241693e6815f5b71333e749f382
parent83b4adb291b2b04a927f80036ffee727d23a9cfc
Merge ... '1a0381ff4565808f58609382d1280e18d59ded7f'
     and '82db3fe8864d686473c6bbf5db186f5fcbc90c5f'