Merge commit 'upstream/0.4.5+svn3042'
authorAndres Mejia <mcitadel@gmail.com>
Sun, 1 May 2011 01:29:49 +0000 (21:29 -0400)
committerAndres Mejia <mcitadel@gmail.com>
Sun, 1 May 2011 01:29:49 +0000 (21:29 -0400)

Trivial merge