Merge branch 'master' of free2.projectlocker.com:sf
authorMarco Costalba <mcostalba@gmail.com>
Mon, 21 Jun 2010 19:50:20 +0000 (20:50 +0100)
committerMarco Costalba <mcostalba@gmail.com>
Mon, 21 Jun 2010 19:50:20 +0000 (20:50 +0100)

Trivial merge