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)
commita596e4b0e06082f1a583c2e27ec4223decf0f73d
tree38fe8e94df851d632576194d4854ee18a3ef2c2a
parentabe019c110947e4351d0b64eb99719b993bb571e
parent4f45506d7980cd65418bef69fedea526c30571f1
Merge commit 'upstream/0.4.5+svn3042'