Merge remote-tracking branch 'upstream/master'
authorYamil Suarez <github@yamil.com>
Wed, 5 Oct 2011 18:02:05 +0000 (14:02 -0400)
committerYamil Suarez <github@yamil.com>
Wed, 5 Oct 2011 18:02:05 +0000 (14:02 -0400)

Trivial merge