Merge branch 'master' into kq_devices
authorSamuel J. Greear <sjg@thesjg.com>
Wed, 7 Jul 2010 15:57:10 +0000 (15:57 +0000)
committerSamuel J. Greear <sjg@thesjg.com>
Wed, 7 Jul 2010 15:57:10 +0000 (15:57 +0000)

Trivial merge