merge of '7d2d2c64f0573cfcecdcba9a80bee0899c24b371'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 5 Sep 2008 14:02:40 +0000 (14:02 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 5 Sep 2008 14:02:40 +0000 (14:02 +0000)
commitbdac33b55c60b405f0cd29fce157f80ecd05d300
tree84b7fba0111ed38c7552de1c28d5ce206dad1237
parent0c9b33dd399e32843b4b8cd412eaf1bc990b63ec
parent3b79d21867a0a8ae992886bb498848a1ad6156ff
Merge ... '7d2d2c64f0573cfcecdcba9a80bee0899c24b371'
     and 'aad166147796a0cf7be319e6fa3878b8cffc981e'