Merge branch 'tooltalkless'
authorSteve Youngs <steve@sxemacs.org>
Tue, 13 Sep 2011 01:22:18 +0000 (11:22 +1000)
committerSteve Youngs <steve@sxemacs.org>
Tue, 13 Sep 2011 01:22:18 +0000 (11:22 +1000)

Trivial merge