Merge branch 'v5.0'
authorLasse Collin <lasse.collin@tukaani.org>
Tue, 26 Oct 2010 12:53:06 +0000 (15:53 +0300)
committerLasse Collin <lasse.collin@tukaani.org>
Tue, 26 Oct 2010 12:53:06 +0000 (15:53 +0300)

Trivial merge