Merge from trunk
[plcapi.git] / trunk / PLC /
2007-11-13 Tony MackMerge from trunk