Merge with 0.9
authorMatthew Wild <mwild1@gmail.com>
Wed, 18 Jan 2012 15:07:40 +0000 (15:07 +0000)
committerMatthew Wild <mwild1@gmail.com>
Wed, 18 Jan 2012 15:07:40 +0000 (15:07 +0000)
commit253a7378a02561129c12b257a45fa6418c66383a
tree5c56b9fa5e4c56536ac9ee9088efc17d611bd0ab
parentf460b249fb5637afaac3e326f54ce1d71fee89c0
parentd3c808c6ac7661bfb4fe7f7680b6bef55a795ba3
Merge with 0.9