merge of '1cdc12c3862be0a347484d50284adc22bea0c4b4'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 25 Oct 2007 11:29:51 +0000 (11:29 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 25 Oct 2007 11:29:51 +0000 (11:29 +0000)
commitfd0a67a7553da6cb524c08b7aea3f5cd809a5381
tree852ac992e85ee8177d0df5d127932306e0285e31
parent94c3777fa5fc58845643fd6fe384b15b269cc77c
parent8ffbd041412ecbd1ce52e62c5dd3cc56057cfde9
Merge ... '1cdc12c3862be0a347484d50284adc22bea0c4b4'
     and 'dd686600ef516db9cad8d6454476424eb47cf9b5'