merge of '5238e30c679ed4c9836291822577cc8cf6d35993'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 29 Dec 2006 21:36:32 +0000 (21:36 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 29 Dec 2006 21:36:32 +0000 (21:36 +0000)
     and '562347f263f94adfc20ea37413a2b6b2a54028fb'


Trivial merge