Merge branches 'master' and 'camping'
commitf64d5462fa5323fc81387f79eebe9e1ae9eb0b08
authorscott Chacon <schacon@agadorsparticus.(none)>
Mon, 19 Nov 2007 01:40:05 +0000 (18 17:40 -0800)
committerscott Chacon <schacon@agadorsparticus.(none)>
Mon, 19 Nov 2007 01:40:05 +0000 (18 17:40 -0800)
treeb1dfd1145aa2c9e2c614a07ba4bccf599ee7ebe0
parent537d483566255f78faf3b1c97027ef85853267dc
Merge branches 'master' and 'camping'