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)
commit8ffe7867261b82482753d258555b1fe3b1b1e939
tree3c89f36b0fdefdb5ba26409104f6846169b52591
parent1606d0a0d5197d3b9debf130c887f1650aeae992
parent03d99022dab1c9065fcad071c359e5b47b0d84f9
Merge commit 'upstream/0.4.5+svn2210'