merge of '685f9c2bb963e57e2c7abc168ebc9bcb6c773b02'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 10 Aug 2007 14:02:03 +0000 (14:02 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 10 Aug 2007 14:02:03 +0000 (14:02 +0000)
commit0abf6c71718fcf6422ee85ae49d7b3d1f2b6e175
tree66d4061225653856a6c5e80ef9c66c0191c01439
parentf07b378887fe386d5bea51c81ace10fe634683b6
parenta4a0c12df391d2727cab8405d76cb4cfdca5f870
Merge ... '685f9c2bb963e57e2c7abc168ebc9bcb6c773b02'
     and 'f9a0a31057fa5ef412d342dce9c8933a0bcf3c1b'