Merge commit 'upstream/0.0_git20110724.48593f5'
authorAndres Mejia <mcitadel@gmail.com>
Sun, 24 Jul 2011 18:15:59 +0000 (14:15 -0400)
committerAndres Mejia <mcitadel@gmail.com>
Sun, 24 Jul 2011 18:15:59 +0000 (14:15 -0400)

Trivial merge