merge of '05fe85ad77e7aace526412ed46891996775f2107'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 14 Feb 2008 09:34:23 +0000 (09:34 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 14 Feb 2008 09:34:23 +0000 (09:34 +0000)
commit2283c29df32fe23efb6bb86d5b993ebb68a218fe
treef6cd7c32bd2722097ef5bfba288e17fe3c766f7e
parent930c99332ebdc3e41fedd5f5b72b556c3c1c6157
parent701f7ac23e9258cfc371495a3c35375c4532ff87
Merge ... '05fe85ad77e7aace526412ed46891996775f2107'
     and '9f227060931d6ef3c46ac867c9d5ab6f7ff4c7b8'