merge of '62f049c7930cc7dcd9a1736a717fff802998ca78'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 23 Aug 2008 13:03:59 +0000 (13:03 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 23 Aug 2008 13:03:59 +0000 (13:03 +0000)
commit85d5a47a22f6b65960cc1f341a43102bf1f74a66
tree02b867dbbed0ab5ef3ee68aa31aad1262cde6868
parent361980fb1ccfbb4dcc263819d3ef4b2716a0bc49
parent68c2f6a64ebf1cd9215886e21526961d9dca7f8a
Merge ... '62f049c7930cc7dcd9a1736a717fff802998ca78'
     and 'c58e498fe9feb390a56441e07fec74a56405b6b1'