merge of '353324dd9a65b594eaee01782ae8aa085ae87b9a'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 15 Nov 2007 14:21:12 +0000 (14:21 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 15 Nov 2007 14:21:12 +0000 (14:21 +0000)
commitf8e955ce1273510dd52eb2f9fa59b74d5ad89a89
tree4080576b9068eeb2456e974a68f59ba4a8ed02cd
parente881f1ce27495bb0e280c76e711cc7208c3a9ebc
parent3515feb8a17b9d84bee4d11191842223ce6f76a6
Merge ... '353324dd9a65b594eaee01782ae8aa085ae87b9a'
     and '5a50d1d54a36230e32c94701cae6d541b1ff2707'