merge of '497bad113a4cfe870e10990d7361bc8a266713e5'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 29 Sep 2006 21:40:13 +0000 (21:40 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 29 Sep 2006 21:40:13 +0000 (21:40 +0000)
     and '7f3fc45ed4f6bbc596b8513870bdaa4ecc6576ce'


Trivial merge