Merge commit 'upstream/1.7.6p1'
authorBdale Garbee <bdale@gag.com>
Tue, 26 Apr 2011 19:58:20 +0000 (13:58 -0600)
committerBdale Garbee <bdale@gag.com>
Tue, 26 Apr 2011 19:58:20 +0000 (13:58 -0600)

Trivial merge