Merged unused variable removal from 3.2.
authorVinay Sajip <vinay_sajip@yahoo.co.uk>
Sat, 2 Jul 2011 16:22:58 +0000 (17:22 +0100)
committerVinay Sajip <vinay_sajip@yahoo.co.uk>
Sat, 2 Jul 2011 16:22:58 +0000 (17:22 +0100)

Trivial merge