Merge branch 'vendor/BZIP'
authorPeter Avalos <pavalos@theshell.com>
Mon, 20 Sep 2010 21:35:14 +0000 (11:35 -1000)
committerPeter Avalos <pavalos@theshell.com>
Mon, 20 Sep 2010 21:35:14 +0000 (11:35 -1000)

Trivial merge