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