wmii

commit 26bd6ca8f7438d854bccd5f1db38b3ec304a00d8
parent 59406f4335c3abb8d30db24d85488f038b4d277e
Author: Kris Maglione <kris@suckmore.org>
Date:   Mon, 17 May 2010 12:11:01 -0400

Merge.