Merge 0.9->trunk
authorMatthew Wild <mwild1@gmail.com>
Thu, 15 Nov 2012 19:07:53 +0000 (14:07 -0500)
committerMatthew Wild <mwild1@gmail.com>
Thu, 15 Nov 2012 19:07:53 +0000 (14:07 -0500)
commit0f09b2b5f893b42e2c1e2471b9d54c3b294fb4a7
treeecbfbaf40e95523ff9970e03f7409e2ace78eb86
parentf56accde08bf0e3d878df0028006a59fc4735730
parentffe09984a5003bf572c6bedb008b85cb377827a1
Merge 0.9->trunk