merge of a0cb602edb3bf2f732004fc35bed483bf4b559f7
authorKoen Kooi <koen@openembedded.org>
Wed, 12 Jul 2006 15:55:08 +0000 (15:55 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 12 Jul 2006 15:55:08 +0000 (15:55 +0000)
commit5c061919b6b36e89aeb508dde90a7cf5fe2dc309
tree6b10d57f80c863dd670f534612a2ee1b7afafc7b
parentdc8bf43ef7e927f0e002f3ae3597eba1bb410d61
parent2fb7dbea15a9defe06eff9e3d63a7ea342e71448
merge of a0cb602edb3bf2f732004fc35bed483bf4b559f7
     and bc5f5478302c34ee064f2f5e7ca8c51c0e226de5