Merge branch 'master' into dreamhost1.0a2-DH
commitcab41f41d8db353213a6e486a37910d9430a7a8f
authorRuby User <ruby@hpbook.(none)>
Mon, 17 Dec 2007 22:26:30 +0000 (17 23:26 +0100)
committerRuby User <ruby@hpbook.(none)>
Mon, 17 Dec 2007 22:26:30 +0000 (17 23:26 +0100)
tree9906bf24198911a0688519ea83486de265c738a9
parent791fd2dc4327137f39edfbac575f3b5c2e58f48d
parent0cdc764d2d2276662885bb932b268c89a888f3e2
Merge branch 'master' into dreamhost