Merge commit 'upstream/0.4.5+svn3450'
authorAndres Mejia <mcitadel@gmail.com>
Wed, 27 Jul 2011 02:43:11 +0000 (22:43 -0400)
committerAndres Mejia <mcitadel@gmail.com>
Wed, 27 Jul 2011 02:43:11 +0000 (22:43 -0400)

Trivial merge