Merge with upstream
authorMatthew Wild <mwild1@gmail.com>
Mon, 16 Jan 2012 01:53:45 +0000 (16 01:53 +0000)
committerMatthew Wild <mwild1@gmail.com>
Mon, 16 Jan 2012 01:53:45 +0000 (16 01:53 +0000)

Trivial merge