merge of 3e6fa3a7826f139009a84b5f7f5a8ad4798c8b88
authorKoen Kooi <koen@openembedded.org>
Thu, 21 Jul 2005 21:29:41 +0000 (21:29 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 21 Jul 2005 21:29:41 +0000 (21:29 +0000)
commit7d1dc55f6d1d02a283c152e26da59e9a99a0ec1e
tree3ed4927768158e0aeb88b06eee869aa80588cacc
parentad7106e337630ec79c8790b548661c01e229576d
parent0f1d1982b7905f3dae21837a7a2ecf0448991d72
merge of 3e6fa3a7826f139009a84b5f7f5a8ad4798c8b88
     and a7ddc196fe367bfa8b749b05d35d405dda04c436