Merge branch 'master' of http://github.com/Sirupsen/bash-it into Sirupsen-master
authorRobert R Evans <robert@codewranglers.org>
Mon, 11 Oct 2010 00:56:26 +0000 (17:56 -0700)
committerRobert R Evans <robert@codewranglers.org>
Mon, 11 Oct 2010 00:56:26 +0000 (17:56 -0700)

Trivial merge