Merge commit 'upstream/0.4.5+svn2210'
authorAndres Mejia <mcitadel@gmail.com>
Fri, 29 Oct 2010 19:19:42 +0000 (15:19 -0400)
committerAndres Mejia <mcitadel@gmail.com>
Fri, 29 Oct 2010 19:19:42 +0000 (15:19 -0400)

Trivial merge