Merge pull request #1 from makoshark/master.
authorErik Garrison <erik.garrison@gmail.com>
Mon, 2 May 2011 18:06:05 +0000 (11:06 -0700)
committerErik Garrison <erik.garrison@gmail.com>
Mon, 2 May 2011 18:06:05 +0000 (11:06 -0700)
commit87e6add2820dd71cd79585d3ffa74f7fe46820f3
tree2186e8eeddb02b0d4d884536a9775e993451a538
parent23bc9bfafc9312bd4f8bb72f22e38c087ef0b0fa
parent59363fd9d5c67c2ec370d436c329508c4b7a6f54
Merge pull request #1 from makoshark/master.

Two Quick Fixes from Mako

Benjamin Mako Hill || Want to submit a patch?