Commit 954f7d01cae6475f752b49daabe44f471962c961

Stefano Lattarini 2011-09-18T18:32:12

Merge branch 'master' into test-protocols