merge of '27baa018f9f9e77156f5eb95353722f773cc651d'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 22 Aug 2007 20:31:50 +0000 (20:31 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 22 Aug 2007 20:31:50 +0000 (20:31 +0000)
commita503988c296bc863232cce143ec991340e8d4dd8
treed6a2d08a45a861da7f89edffa9894df673807cba
parentbd5a009fca1657c7778884a3f04ba645077d86a5
parentee8c7fff7a920cdd64f80b314509c20eded79ccd
Merge ... '27baa018f9f9e77156f5eb95353722f773cc651d'
     and 'a61caf645adcb41a0f8ba344818d237040ae0bc9'