Merge branch 'v5.0'
authorLasse Collin <lasse.collin@tukaani.org>
Sun, 12 Dec 2010 21:13:22 +0000 (23:13 +0200)
committerLasse Collin <lasse.collin@tukaani.org>
Sun, 12 Dec 2010 21:13:22 +0000 (23:13 +0200)

Trivial merge