merge of 'cf825d08cde9f17188ff1a768443dd312658cb7d'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 22 Feb 2007 15:01:05 +0000 (15:01 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 22 Feb 2007 15:01:05 +0000 (15:01 +0000)
commitd3496eaadf50d896a6fd89fed51a4f6a50e508f6
tree392c697728be15230d13135c51d19ae47420fa2d
parent3be447302b930764d434b759e27ac7493ed59df7
parente82e0fefd8171f2fc9ab86324cb1b8a7c70cf542
Merge ... 'cf825d08cde9f17188ff1a768443dd312658cb7d'
     and 'e00e94a7a53482bae8665a86de5dfc79645b03fb'