Merge branch '247-item-rewrite' veekun-promotions/2011041101
authorEevee <git@veekun.com>
Mon, 11 Apr 2011 01:22:05 +0000 (18:22 -0700)
committerEevee <git@veekun.com>
Mon, 11 Apr 2011 01:22:05 +0000 (18:22 -0700)

Trivial merge