merge of '1bf5b0badb102f7bb3da330b7e7a24077d2dd3b2'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 14 Apr 2008 13:44:40 +0000 (13:44 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 14 Apr 2008 13:44:40 +0000 (13:44 +0000)
commit9551c837e21a5667684b905303a9dda572c13fc4
tree8cc2ade4fe5a13caf60d50f466c39361056e5660
parentece4b8e1d4e427ac7615b26df32b85b725a26c84
parent7b929c9b4187e9126bea782e84ebc2027e5b2bbf
Merge ... '1bf5b0badb102f7bb3da330b7e7a24077d2dd3b2'
     and 'bfd97eeef754278ceda2ed7f140fb611e080e1f7'