merge of '23ca474a9b8158ff4608c0bbd8ce769d4e3d9348'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 27 Aug 2007 13:03:45 +0000 (13:03 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 27 Aug 2007 13:03:45 +0000 (13:03 +0000)
     and '783abb459e4b178a6920bddfbdabde444f4895db'


Trivial merge