Merge branch 'master' into release-0.10 release-0.10
authorWilliam Morgan <wmorgan-sup@masanjin.net>
Sat, 23 Jan 2010 18:02:14 +0000 (13:02 -0500)
committerWilliam Morgan <wmorgan-sup@masanjin.net>
Sat, 23 Jan 2010 18:02:14 +0000 (13:02 -0500)
commitc9a6df5f3307381a6932736ca0eb8d8051342113
tree7dc380b3f77f027a8cead0c56719abe0704a33e0
parentf6c08b442fac9717aea705563cdc9f63d23f0abd
parent82b9625f54078aca31947114ad9f26160ecce4be
Merge branch 'master' into release-0.10