merge of '484354fc7d908c35f064448e992d669099255726'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 8 Aug 2007 07:58:38 +0000 (07:58 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 8 Aug 2007 07:58:38 +0000 (07:58 +0000)
commit024e5baced24b9369c1564229305c9f0a634e49f
tree0feeac08ed6392215cef35155cf7c4823deee7f4
parentbf0561f41898b938a6f772a4006a113bbf51393a
parent16ad89629fee5be7cc5f3d9e4d33e07bd47740ae
Merge ... '484354fc7d908c35f064448e992d669099255726'
     and 'f048a9bae79ea733471cb26e128894d77a0d80d6'