Merge
authorChris Larson <clarson@kergoth.com>
Thu, 23 Sep 2004 16:35:27 +0000 (16:35 +0000)
committerChris Larson <clarson@kergoth.com>
Thu, 23 Sep 2004 16:35:27 +0000 (16:35 +0000)
commit22a582dcd95e683e04209c113a389a891a8bf540
tree6ef309c99685162b84769e15d3c2f588b39f6691
parent8c297d83ec322eeae542a2c823a80bf02e0fe81b
Merge

2004/09/20 06:23:02-07:00 conversagent.com!fontenot
Merge bk://nslu2-linux@nslu2-linux.bkbits.net/packages
into chilli.conversagent.com:/home/packages/oe/nslu2/packages

BKrev: 4152fb4fjnSnbDdaVf8VMCg9o1cLQw