Merge branch 'release/0.4'0.4
commit9e92296837645c2cbd73e9e838b5a28d72098390
authorPeter Krenesky <peter@osuosl.org>
Wed, 26 Jan 2011 23:18:45 +0000 (26 15:18 -0800)
committerPeter Krenesky <peter@osuosl.org>
Wed, 26 Jan 2011 23:18:45 +0000 (26 15:18 -0800)
treed2ee2716d624c0b48f5b7e026d09daf9478f8790
parent3d36fb6f9efeb8c284bf31f2e898f79a53d106ef
parent0776e07482c5858517c6be4970c6d382f5340031
Merge branch 'release/0.4'