merge of '948a3826e06f14adc54097e1356e07ee2779f1b6'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 13 Oct 2006 17:34:24 +0000 (17:34 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 13 Oct 2006 17:34:24 +0000 (17:34 +0000)
commita569a19e6d0652551a5cfb00e6f9d913a2b25b32
tree5b9ddf082540bbb40a27d51927403d0709aed107
parent0ed82176b7f53cea414f005af94a98532d765038
parent32e8f349bb510ad6bde5dcb7955535035faf5aa8
Merge ... '948a3826e06f14adc54097e1356e07ee2779f1b6'
     and 'a432db96d075c07f39a31ed168e1dfe9996f7a9a'