merge of '9b6c5160cff651f4a9456777e0128466a236ebe4'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 15 May 2007 11:57:32 +0000 (11:57 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 15 May 2007 11:57:32 +0000 (11:57 +0000)
commit3eef0ac777ef9fe0983e40d70135c57183988ecc
treed680e6a9dc97fd8f2f2533febb8d07c7ba684439
parent7a6b315cf123f79f454598c3068e2e017b156e92
parent6cae298da4fd494bb28a77e48d4f0383f0cb6272
Merge ... '9b6c5160cff651f4a9456777e0128466a236ebe4'
     and 'a4859537da343f2db1d20f9d26c0a20fd655ddbe'