merged from trunk
[psensor.git] / ChangeLog