Merge from trunk; use initscript name instead of id
[plcapi.git] / trunk / tests /
2007-11-13 Tony MackMerge from trunk