merge of 'f1c0af35653349c378da9671d2861f1aa08e4ecc'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 31 Jul 2008 15:37:03 +0000 (15:37 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 31 Jul 2008 15:37:03 +0000 (15:37 +0000)
commitea00464153e0ae794b5f3ae1fb1ca29585287495
treed19d0b8502b69c1572c258c01f57387c6a40e3a8
parent24167e4577d7a883aa764d846cb2bb467b1f271b
parentb348f99cc9703cabf6668afc92a5f1799325db81
Merge ... 'f1c0af35653349c378da9671d2861f1aa08e4ecc'
     and 'f5b5a855a9ceef36d2e91eb4defd3cafafea854d'