Merge branch 'master' of http://github.com/mrman208/bash-it into mrman208-master
authorRobert R Evans <robert@codewranglers.org>
Tue, 12 Oct 2010 23:04:52 +0000 (16:04 -0700)
committerRobert R Evans <robert@codewranglers.org>
Tue, 12 Oct 2010 23:04:52 +0000 (16:04 -0700)

Trivial merge