merge of '2b134fb4a5278b379deec7fbafe34576ac3f266c'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 6 Mar 2008 17:58:28 +0000 (17:58 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 6 Mar 2008 17:58:28 +0000 (17:58 +0000)
     and '7c95723b0419570396f3810cc7a82f22626eb854'


Trivial merge