Merge commit 'origin/master'
authorOlivier Tétard <olivier.tetard@miskin.fr>
Tue, 25 Aug 2009 19:46:50 +0000 (21:46 +0200)
committerOlivier Tétard <olivier.tetard@miskin.fr>
Tue, 25 Aug 2009 19:46:50 +0000 (21:46 +0200)
commit49435be5aefbd2440f0a242191e818caf349ac22
tree67f37dae20822f7c867f0c8dff6365eeb355e8a8
parentedd0af9bd4b2657a0981a0c91bc254795c8dde12
parentfc7d4ae223a202d6fd30d9f0ec9e4b3e1fd9c913
Merge commit 'origin/master'