merge of '9c284cd4dcd70a6810c5c2b6081836536cadeddd'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 25 Jan 2007 18:50:41 +0000 (18:50 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 25 Jan 2007 18:50:41 +0000 (18:50 +0000)
     and 'b047443ea33cc6dcb484249e6a25690afab83c4e'


Trivial merge