merge of '6882e7778ca3177ffae3e35d426bb9f2a6b3ab9c'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 13 Sep 2008 01:53:37 +0000 (01:53 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 13 Sep 2008 01:53:37 +0000 (01:53 +0000)
commit6c26593ed51f6aba1b7d9ee35bfe81d5d496e716
tree71b07f6eb4a40523472c298550f811b543bcfaa7
parent2da8451745e6168f888392698258ff8fa1e94f76
parent1f7f72722ef5610442b4631e6474919e8b7c0e41
Merge ... '6882e7778ca3177ffae3e35d426bb9f2a6b3ab9c'
     and 'c07f5c2e4c25e6b3d2a46e06ac9b6aee412395a1'