merge of '4ed305871b29e4d307ecf92b216e8016878ca38b'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 11 Mar 2007 13:55:17 +0000 (13:55 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 11 Mar 2007 13:55:17 +0000 (13:55 +0000)
     and '847f1a2d783aabf61e298cb98883fbdbadb92a8f'


Trivial merge