merge of 4ad70d03f3a19dce2f2582ea1b294336864413d6
authorJustin Patrin <papercrane@gmail.com>
Tue, 4 Apr 2006 21:29:08 +0000 (21:29 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 4 Apr 2006 21:29:08 +0000 (21:29 +0000)
commitc90a7ccedc038f8739996174ec245c7e2f35dc05
tree4496991b8d1e32a7e46b78997c07c7e4c5a06b02
parent14074512754b1a0e6c54d70de70279d24dd10f25
parent5803e33dfe8b1f226b28a5fb1081d11270ac7e48
merge of 4ad70d03f3a19dce2f2582ea1b294336864413d6
     and 655f5a13bd458949813a8bf00c6865edb43cc35b