merge of 'c3ca473fa0f2691fd3779230e61273dde401f5a4'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 18 Dec 2007 17:20:23 +0000 (17:20 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 18 Dec 2007 17:20:23 +0000 (17:20 +0000)
     and 'eae950ac7860db142942252d261d665e31150f2d'


Trivial merge