merge of '52b8f41a965e291eede4b4094b41d82b1b115c2f'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 26 Apr 2007 19:45:19 +0000 (19:45 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 26 Apr 2007 19:45:19 +0000 (19:45 +0000)
commit3cf447d1990e83a036a0272adb5eb198a8338784
treeb33e6579115db3c406e9e088b7ad05606bbd19de
parent5fe86ee223dc74fcddffe5563f66f2ca2577068c
parent4a5461c3378fa00e5991ea9a198b114550229ab8
Merge ... '52b8f41a965e291eede4b4094b41d82b1b115c2f'
     and '8a96b7a7e6f32d11685d21a5c12d5420a27e8110'