Merge branch 'master' into export-fixes
commitd2830a5816216dd6f7d78041ee202e68d6adf5ba
authorStephane Letz <letz@grame.fr>
Tue, 3 May 2011 18:46:43 +0000 (3 20:46 +0200)
committerStephane Letz <letz@grame.fr>
Tue, 3 May 2011 18:46:43 +0000 (3 20:46 +0200)
treee841594714d889da152ed01d3bafaf1f5aaf6ae9
parentf94bf7174d155decbe7f483fea3fef056d66b104
parent2d12663fdabf8ef8e9a010a9c3f7f18746d64122
Merge branch 'master' into export-fixes