Commit a3d1cdbc30755257b4a0f001c4cc8e6acaba72d1

Stefano Lattarini 2011-10-07T13:11:57

Merge branch 'master' into test-protocols