Merge pull request #25 from marinaglancy/wip-nov14-rubric
authorDavid Mudrak <david.mudrak@gmail.com>
Mon, 14 Nov 2011 08:20:16 +0000 (00:20 -0800)
committerDavid Mudrak <david.mudrak@gmail.com>
Mon, 14 Nov 2011 08:20:16 +0000 (00:20 -0800)

Trivial merge