Merge 0.8->trunk
authorMatthew Wild <mwild1@gmail.com>
Sat, 8 Jan 2011 23:21:28 +0000 (23:21 +0000)
committerMatthew Wild <mwild1@gmail.com>
Sat, 8 Jan 2011 23:21:28 +0000 (23:21 +0000)
commit32ba2cc5849421867c3180a33d1eebc1e105978a
tree3ba3493f1c214f6b635c901a0ba591a1ac3f5196
parent999d49c95d9a8b7d96068a68c11432899ce2f9c8
parent69ee95c767da3107b1623b31a5606375850e08e5
Merge 0.8->trunk