Merge remote branch 'janl/master'
commitec2c70641dae7c982524b92a7d314054f8da25ed
authorScott Chacon <schacon@gmail.com>
Fri, 28 May 2010 17:40:31 +0000 (28 10:40 -0700)
committerScott Chacon <schacon@gmail.com>
Fri, 28 May 2010 17:40:31 +0000 (28 10:40 -0700)
tree221a2ff232a167086ea1dc9125749ee57cd7924a
parentd2c20d2d3164d607eef5ce4234f265b830ebc9d5
parente81609748517cde14956251ee0c755a46c439108
Merge remote branch 'janl/master'