Fixes #7397.
authorColin Snover <github.com@zetafleet.com>
Tue, 14 Dec 2010 06:40:28 +0000 (00:40 -0600)
committerColin Snover <github.com@zetafleet.com>
Tue, 14 Dec 2010 06:40:28 +0000 (00:40 -0600)

Trivial merge