merge of 2e3b25afd1276eaa7c2205ada5c506c1a6e8df5e
authorKoen Kooi <koen@openembedded.org>
Sat, 8 Jul 2006 14:33:26 +0000 (14:33 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 8 Jul 2006 14:33:26 +0000 (14:33 +0000)
commit592ad7f90afcc2bfac021f3fa3631d0ce26ed8cb
tree8939e5244e940bad8f3c3827fd6c8b45a1c7d219
parentaaed825f7dbded762361f9e8d8866f34eee7a60a
parent8601696ecda27746b65d53f3f7f2f62fc3cfa83b
merge of 2e3b25afd1276eaa7c2205ada5c506c1a6e8df5e
     and 2eff0430ea1b3fe81d0bd31a6d70b1ac317bee6e