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)
commit2e0938eeff14cfbee6df2a792dcf465dacefde5c
treef4e2881e00ca6ef98e19f8b64e76736b45b5dd29
parent0d5191f594c3fcfaa699d6257f13cf0ca157aa72
parent252c33779642abb4a61ce35757f0a0d230d03d15
Merge commit 'upstream/0.4.5+svn3450'