merge of '755167f16f9b0fce49c13343f86891cd973fc1cb'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 27 Nov 2006 22:05:13 +0000 (22:05 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 27 Nov 2006 22:05:13 +0000 (22:05 +0000)
     and 'aaef2980a4428dedfb31b38d6894621134b0faa8'


Trivial merge