merge of '2418db31e5eea055a273730099614b6244381544'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 7 Jun 2007 08:36:20 +0000 (08:36 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 7 Jun 2007 08:36:20 +0000 (08:36 +0000)
     and '7c5741a3a4f2a7ad883bd3230a46e4c9ebac2106'


Trivial merge