Merge.
authorKris Maglione <jg@suckless.org>
Wed, 23 May 2007 20:44:15 +0000 (16:44 -0400)
committerKris Maglione <jg@suckless.org>
Wed, 23 May 2007 20:44:15 +0000 (16:44 -0400)

Trivial merge