Merge branch 'master' into official
authorJoshua Oreman <oremanj@xenon.get-linux.org>
Sun, 3 May 2009 20:21:04 +0000 (13:21 -0700)
committerJoshua Oreman <oremanj@xenon.get-linux.org>
Sun, 3 May 2009 20:21:04 +0000 (13:21 -0700)

Trivial merge