merge of 'a77bbd441d90f7bcc382233502647387947ff15c'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 25 Oct 2007 14:35:21 +0000 (14:35 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 25 Oct 2007 14:35:21 +0000 (14:35 +0000)
commit23becfae8e9c210bdf0e3df07dfe6e7c7fc37d89
tree8564a727cfabaf32bc140dc7fd1f670780c5d5c6
parent18d3eb1cfffbca97f882161dfe942882a02fe9f1
parentebafdf0656c660f7a49383d55a1c2cb760dacfec
Merge ... 'a77bbd441d90f7bcc382233502647387947ff15c'
     and 'be2bdd5c0b8ef23087e82756662dbfe583e4855e'