merge of '1168c6045fce975d6d8f7098c478705bea1622c8'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 31 Oct 2007 10:39:15 +0000 (10:39 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 31 Oct 2007 10:39:15 +0000 (10:39 +0000)
     and '7eab9a5db962d1b8a39d67ad82cffc92b511633b'


Trivial merge