merge of d7d2b282dadda7b779a80c0f37b124c7ac66f441
authorGraeme Gregory <dp@xora.org.uk>
Fri, 7 Jul 2006 09:42:39 +0000 (09:42 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 7 Jul 2006 09:42:39 +0000 (09:42 +0000)
commit9e3e132b707f3b5471834ecb62aecef5d86ae9f7
tree2cf0ff6d39921db43984711e38eaf02ce05c243b
parent70fb7db46eaf05491c04ef72d8ee5ac4ff0fbb9a
parent2df9f2514bd102fa98b2579a6d1f38ef7e9c0aba
merge of d7d2b282dadda7b779a80c0f37b124c7ac66f441
     and f69048cb1da290493a5bd429ce6a81de777410d2