Merge remote branch 'egi/master'
commitd44788acc71d743fcda7225634af88bbd40752c1
authorScott Chacon <schacon@gmail.com>
Sat, 10 Apr 2010 15:07:20 +0000 (10 08:07 -0700)
committerScott Chacon <schacon@gmail.com>
Sat, 10 Apr 2010 15:07:20 +0000 (10 08:07 -0700)
tree89b8a89664aa49e599d95db8f7a68081b710940b
parenta5e2ac945fbc030d0f0d27c6596639b7da20ab78
parent32fc4d737cf11fc53da0099d90d5b31781eabb6f
Merge remote branch 'egi/master'