merge of '1baac115ff1ee3cfa594ac8bdb5a672342a18c6b'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 14 Mar 2008 09:52:08 +0000 (09:52 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 14 Mar 2008 09:52:08 +0000 (09:52 +0000)
     and '81a7886604b6eb56e9b3e0e7e7a2032428d40826'


Trivial merge