merge of '3b5a264cff607e4c4977e318dde1e861a664ad81'
authorKoen Kooi <koen@openembedded.org>
Thu, 15 May 2008 17:16:12 +0000 (17:16 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 15 May 2008 17:16:12 +0000 (17:16 +0000)
commit5384da8d9f6a9323eeb30b4110b1deb277f23912
tree31dc0925f1e1596e6f944a3b7215049be34987c8
parent1da46e43114e8fea06d3d08f9bd22ef3dd7dd895
parentefeb5d474145788e9466d66cd1168c2d6939cd0f
Merge ... '3b5a264cff607e4c4977e318dde1e861a664ad81'
     and '92366ccb09c8d809619c585c91fe69a2046e1396'
packages/dsplink/dsplink_1.50.bb