Merge commit '38d5389f3054164a2f04d6e4e8fe381aa5ee03fc' into vrt
authorJosh Blum <josh@joshknows.com>
Mon, 12 Oct 2009 19:16:12 +0000 (12:16 -0700)
committerJosh Blum <josh@joshknows.com>
Mon, 12 Oct 2009 19:16:12 +0000 (12:16 -0700)

Trivial merge