Merge branch 'release/0.6'0.6
commit0e53edac9768f6673fa92f52d8ef8b76c9f22db0
authorPeter Krenesky <peter@osuosl.org>
Fri, 4 Mar 2011 22:59:22 +0000 (4 14:59 -0800)
committerPeter Krenesky <peter@osuosl.org>
Fri, 4 Mar 2011 22:59:22 +0000 (4 14:59 -0800)
tree0f4b9a5c6b2039f586ba92ff67c8e382a2387a35
parent233f420ac1a87fe97719a6c3daaff5b3f27b9b67
parent0c8f0442df397b7c2f5eec75fda1f5ad09a7f92a
Merge branch 'release/0.6'