merge of 'b9c37660cebe17de93a1e9fd5e1be9c5035fb211'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 17 May 2007 08:33:38 +0000 (08:33 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 17 May 2007 08:33:38 +0000 (08:33 +0000)
commit406ae9024683ceffe740552f446abd0003c71e5b
tree9dda061144ccacbed53ef21377a9b13138f0f0a9
parent6c17a5707a13b8e875a78105d9d3a5a6f2ecc695
parente8e9bb890f435c365b64b608aa69ee08f37fb760
Merge ... 'b9c37660cebe17de93a1e9fd5e1be9c5035fb211'
     and 'f964905bf487728eff9d71fa4573ba288c6ed392'