merge of 'bd3711fbb9c0d355dbbef7978d07125ff2b635f5'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 19 Feb 2008 00:40:23 +0000 (00:40 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 19 Feb 2008 00:40:23 +0000 (00:40 +0000)
commitdb609dad15bffd0c11445fbb4c5d5413f7c01620
tree6de89f520fe1acbbea94a9451c9a8f4fea51dd08
parentb5a19ef64dc7a61915bf05510a975dd9d1dce2ee
parent55269916959bddb4a07f06825e1ab0a47feba221
Merge ... 'bd3711fbb9c0d355dbbef7978d07125ff2b635f5'
     and 'c2ee59d447a958de79c86638383bdd570aea81c7'