merge of '71635c6dc57d6cc221c7f87d1820130c74ed3ba1'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 4 May 2008 17:22:18 +0000 (17:22 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 4 May 2008 17:22:18 +0000 (17:22 +0000)
commit568266de9dfacc7ffd261b17ff6dc5cd625769d6
tree1e318317aa7fba26353039d704ddcc5311b179ff
parentc7986d4bbe4531bfc0e240d87a5661f865f07044
parentb37c94e0cdaf4c7a7e908113d89041df01ab029f
Merge ... '71635c6dc57d6cc221c7f87d1820130c74ed3ba1'
     and 'e5ca2be92e2e455ddafe9234b967650570ba1462'