Merge commit 'upstream/1.2.0'
authorAndres Mejia <mcitadel@gmail.com>
Sun, 8 Jan 2012 18:14:01 +0000 (13:14 -0500)
committerAndres Mejia <mcitadel@gmail.com>
Sun, 8 Jan 2012 18:14:01 +0000 (13:14 -0500)

Trivial merge