Merge branches 'master' and 'mymerges'
authorJoshua Ferraro <jmf@liblime.com>
Fri, 5 Oct 2007 18:57:49 +0000 (13:57 -0500)
committerJoshua Ferraro <jmf@liblime.com>
Fri, 5 Oct 2007 18:57:49 +0000 (13:57 -0500)

Trivial merge