merge of '358ee536bc83b766d3a66b4fa27a3fef5012ace8'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 19 Mar 2008 15:13:20 +0000 (15:13 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 19 Mar 2008 15:13:20 +0000 (15:13 +0000)
commit25eedda69f63b6b121b60eec713289a3dccb6561
tree2a4d98f3a81c270eae5b690e5418767f8f0b3d44
parent0f1f8ff6f100e7a9b9a2438459d55995a47c061b
parent3844e6e3306a7827cc31ec7a82a7d0a63fce0473
Merge ... '358ee536bc83b766d3a66b4fa27a3fef5012ace8'
     and '769fde4a1014e93e04fd7d91a1626690100f1306'