merge of '2601e7ef59afcc83010bc4a599716c775a867e2e'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 20 Dec 2006 13:41:22 +0000 (13:41 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 20 Dec 2006 13:41:22 +0000 (13:41 +0000)
     and '2cb095a37f96f3f076129401bcf32c8ad04a340f'


Trivial merge