merge of 'de732b9edab14596e25612f268a89373d0b775ab'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 22 Feb 2007 21:19:29 +0000 (21:19 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 22 Feb 2007 21:19:29 +0000 (21:19 +0000)
commitb2c1c9e34eb2d5d75a205b735e90043e24048e9e
tree45bce2417622317df12ed29919f7b3bbd3ed5be7
parentb21b3d1e65fdc948238b90e40577c9814baea05e
parent6eff3e818bd223b63a399c5f59532da1032610e4
Merge ... 'de732b9edab14596e25612f268a89373d0b775ab'
     and 'e09470e6a979b0419df41161d7a1b4e89fce5c79'