merge of '27361f2a0b1eebdce6a9d0830236764c47824c0d'
authorKoen Kooi <koen@openembedded.org>
Thu, 15 Feb 2007 10:02:38 +0000 (10:02 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 15 Feb 2007 10:02:38 +0000 (10:02 +0000)
commitdbcf121fc316eb1bcaf825fbbefee20f6e861ea5
tree75cd5d95362b7a4fdc572e0e0d50d72ba6cc05a8
parent1a45abe9f683c387eb6603397c22cc332945920e
parenta6f95f4629df0c8f7ba193b6cb460a372da6068f
Merge ... '27361f2a0b1eebdce6a9d0830236764c47824c0d'
     and '8b14b75b01474b46308d68ecc3bc79cdde6a3ab9'