merge of '2756e6b25efd4532c1a23fd31f68481d2f8b68a3'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 29 Nov 2007 22:52:57 +0000 (22:52 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 29 Nov 2007 22:52:57 +0000 (22:52 +0000)
commit893391922a439ff9b2695d2e9e91c6060348bc41
treed7380106d61494bba7ff06f7892407d65f044582
parent5a14f0b2120aa8004ead8422cb291f3aec0b9d01
parentae7eb4076905d0b10613ba756acc9924e3d4fbaf
Merge ... '2756e6b25efd4532c1a23fd31f68481d2f8b68a3'
     and '9c32fcb38cb012f79311cd1b07560964873c6307'