Merge from trunk; no longer check if slice is local or peer
[plcapi.git] / trunk /
2007-11-13 Tony MackMerge from trunk