Merge remote branch 'upstream/master'
authorAnthony Tong <atong@trustedcs.com>
Fri, 2 Sep 2011 14:09:43 +0000 (10:09 -0400)
committerAnthony Tong <atong@trustedcs.com>
Fri, 2 Sep 2011 14:09:43 +0000 (10:09 -0400)

Trivial merge