Merge change I0a56959e into eclair-mr2

* changes:
  Implement a HierarchicalStateMachine