Merge branch 'newapi'
authorVanessa Ezekowitz <vanessaezekowitz@gmail.com>
Sat, 26 Jan 2013 03:39:47 +0000 (22:39 -0500)
committerVanessa Ezekowitz <vanessaezekowitz@gmail.com>
Sat, 26 Jan 2013 03:39:47 +0000 (22:39 -0500)

Trivial merge