merge of '3a47981fd330163efa2f76ef144ec299e22bfa96'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 24 Apr 2008 12:19:18 +0000 (12:19 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 24 Apr 2008 12:19:18 +0000 (12:19 +0000)
     and '3afb4ffc02c1e4bde1031645cfa9f8e5465f2138'


Trivial merge