Merge commit 'upstream/1.8.3p1'
authorBdale Garbee <bdale@gag.com>
Wed, 26 Oct 2011 22:58:53 +0000 (00:58 +0200)
committerBdale Garbee <bdale@gag.com>
Wed, 26 Oct 2011 22:58:53 +0000 (00:58 +0200)
commitc21e9cfceaa0560b9980b7a10f353c82e739913b
treee9dbafd16a0662273e8483fa07428f33a3ea4cea
parentacae96344da1690b0816ed50243d2011acf1571a
parent3a9f5f17329715f3bc44f8680c997f0f551ff59f
Merge commit 'upstream/1.8.3p1'