merge of '4d6ee85cc3ba867945ab4763b494533e79d9e0ac'
authorKoen Kooi <koen@openembedded.org>
Wed, 30 Jul 2008 15:15:43 +0000 (15:15 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 30 Jul 2008 15:15:43 +0000 (15:15 +0000)
commit290c319caa59d7442b1606f3dfbabef370310400
treecef0cb146678768f5d9641de30792be651813b56
parent54fba797ebffea5b39ff68da4d8f80b88d9708f7
parent1b681e4e040909fc196e588f8b11b5a1034c6197
Merge ... '4d6ee85cc3ba867945ab4763b494533e79d9e0ac'
     and '750fe5c3f11c985f4ea63c4d0e6a98d0326f40b7'