merge of '31db29464dd50bf11190fd9efbeaece3d3e83025'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 19 Dec 2006 16:31:59 +0000 (16:31 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 19 Dec 2006 16:31:59 +0000 (16:31 +0000)
     and 'c4e8134bca9407021f67cdf9cd64c63ed7bd009f'


Trivial merge