Merge branch 'master' into wireless
authorJoshua Oreman <oremanj@xenon.get-linux.org>
Sat, 13 Jun 2009 18:49:23 +0000 (11:49 -0700)
committerJoshua Oreman <oremanj@xenon.get-linux.org>
Sat, 13 Jun 2009 18:49:23 +0000 (11:49 -0700)

Trivial merge