merge of '40d52bf1bf72c125584b4da643b7f704470ad4fc'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 18 Oct 2007 13:05:36 +0000 (13:05 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 18 Oct 2007 13:05:36 +0000 (13:05 +0000)
     and 'f3f1577d966df858daae7d11db4c333547563bfa'


Trivial merge