Merge commit 'chunzi/master'
commit15caae3a81b23f911e31d28d6e921a5a23d793b6
authorScott Chacon <schacon@gmail.com>
Sat, 1 Aug 2009 19:21:47 +0000 (1 12:21 -0700)
committerScott Chacon <schacon@gmail.com>
Sat, 1 Aug 2009 19:21:47 +0000 (1 12:21 -0700)
treeca67721001127e1687b6e34af42521a5b2ae874c
parent262e6ca8c77e4375b1532fb516c370eedc7c8f86
parentf963b3b115c2ae705aca107e39e2340669ac491c
Merge commit 'chunzi/master'