Merge branch 'noqqe-master'
authorMark Szymanski <mrman208@me.com>
Mon, 6 Dec 2010 22:05:34 +0000 (16:05 -0600)
committerMark Szymanski <mrman208@me.com>
Mon, 6 Dec 2010 22:05:34 +0000 (16:05 -0600)

Trivial merge