merge of '0f71fa3d11b92ce6173ba2ed5c99235de2f4f336'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 2 Mar 2007 21:04:37 +0000 (21:04 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 2 Mar 2007 21:04:37 +0000 (21:04 +0000)
commit319705ddf2763a3e32b031be3a758b7b6ccabe17
tree15e266a9f09971caf0e375b54a35aec879f1dad4
parent2434e5ad46a1e210328cdcc85e3c495de7620f05
parent51b10ddd2d471c9649a977a99619f01a4918fb0f
Merge ... '0f71fa3d11b92ce6173ba2ed5c99235de2f4f336'
     and '224b2627ae546c41a7f4d0e2b52fd423add29479'