Merge branch 'master' into selwakeup
authorSamuel J. Greear <sjg@thesjg.com>
Tue, 13 Jul 2010 11:20:38 +0000 (11:20 +0000)
committerSamuel J. Greear <sjg@thesjg.com>
Tue, 13 Jul 2010 11:20:38 +0000 (11:20 +0000)

Trivial merge