Merge remote branch 'garak/master'
commit4176f19e68c0c5bd50866f069169953950f624ea
authorScott Chacon <schacon@gmail.com>
Fri, 28 May 2010 17:44:29 +0000 (28 10:44 -0700)
committerScott Chacon <schacon@gmail.com>
Fri, 28 May 2010 17:44:29 +0000 (28 10:44 -0700)
treee1388b8a0d0330323e4ac294edbd6fd9d9e6c589
parent5c3d9cadae955ed4fe4af927134557ef0f639dbc
parent038490af5e88695f7ce7a04a841f14d296f07f21
Merge remote branch 'garak/master'