Merge branch 'v5.0' origin/HEAD origin/master
authorLasse Collin <lasse.collin@tukaani.org>
Mon, 15 Nov 2010 12:33:01 +0000 (14:33 +0200)
committerLasse Collin <lasse.collin@tukaani.org>
Mon, 15 Nov 2010 12:33:01 +0000 (14:33 +0200)

Trivial merge