merge of '56286ad1242ca609acecef5bc84883c2f9de92bb'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 6 Dec 2007 11:34:42 +0000 (11:34 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 6 Dec 2007 11:34:42 +0000 (11:34 +0000)
commitf1619dffc8727fdd69f259bac4c82119d9c45bb7
tree93ddcf0eb87726362f3931b0e9ef3536bee825b3
parentee1b83d05c96199a45b53840e96eafc6dec33d6e
parentea215323dfd962d50a16ece2f1e7a0300200bf72
Merge ... '56286ad1242ca609acecef5bc84883c2f9de92bb'
     and '9981f4c01256065169ba2a4cd1e33f5e6b565e61'