merge of '9958e850eb5662928f6727c3a8ae9d71ac7f03f5'
authorKoen Kooi <koen@openembedded.org>
Sat, 7 Jul 2007 08:19:09 +0000 (08:19 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 7 Jul 2007 08:19:09 +0000 (08:19 +0000)
commit1d662a16914582e72b023f683d9f7da414e4205a
tree8569db2e447cdc77032b32b961069706c81c7808
parentbf3678393e367d3f66164263fc7979948247496c
parentba0f15a5e9b4ffba4d5ed367bb3b2c2960bbc022
Merge ... '9958e850eb5662928f6727c3a8ae9d71ac7f03f5'
     and 'f60008d7bc62036b2f56fac511571e1bd12c4215'