merge of '1aa9d5d2291a43dd7550da56fed4507af7db2c81'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 20 Aug 2007 15:32:20 +0000 (15:32 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 20 Aug 2007 15:32:20 +0000 (15:32 +0000)
     and 'e36bd25beb3708ad700892730953005d81ac203b'


Trivial merge