am 595c4092: am 8fb0faf3: Merge change I0a56959e into eclair-mr2

Merge commit '595c40920f31ba7b6674eb341548173e2aaf6ea7'

* commit '595c40920f31ba7b6674eb341548173e2aaf6ea7':
  Implement a HierarchicalStateMachine