merge of '30914cc94bbce1be08b75646f1755f25e9f9f4e1'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 19 Aug 2007 11:08:39 +0000 (11:08 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 19 Aug 2007 11:08:39 +0000 (11:08 +0000)
commit8f66510f0c7a19fe3d427a7d5d346b595fa35197
tree58aafd9ceca7f74b69d8327bd13b0e344c666431
parent3f2af8e708acc5f64e507ed235c4285554b110c3
parente365c73d32fc87f49022828ea27b48e66c9dc249
Merge ... '30914cc94bbce1be08b75646f1755f25e9f9f4e1'
     and '6ffb91c6ed7cb12ad15b404b2661660cf1988445'