Merge with 0.7
authorMatthew Wild <mwild1@gmail.com>
Thu, 25 Feb 2010 18:08:59 +0000 (18:08 +0000)
committerMatthew Wild <mwild1@gmail.com>
Thu, 25 Feb 2010 18:08:59 +0000 (18:08 +0000)
commited274c2f0010bae09b793bbb0fcbba035b43d00a
tree694651bed0dd85190842359c60cb71eb006723ef
parent095d291f5356ff2450c11608fda6bdabc4286f91
parent5b5db8c5a03bedec1301e01cf1020cddf5d35296
Merge with 0.7