Merge branch 'selwakeup'
authorSamuel J. Greear <sjg@thesjg.com>
Mon, 19 Jul 2010 21:25:57 +0000 (21:25 +0000)
committerSamuel J. Greear <sjg@thesjg.com>
Mon, 19 Jul 2010 21:25:57 +0000 (21:25 +0000)

Trivial merge