Backport fix for Bug#8672 from trunk
authorChong Yidong <cyd@stupidchicken.com>
Sun, 15 May 2011 14:22:31 +0000 (10:22 -0400)
committerChong Yidong <cyd@stupidchicken.com>
Sun, 15 May 2011 14:22:31 +0000 (10:22 -0400)

Trivial merge