Merge ssh://drop.maemo.org/git/kernel-bfs
authorCorey O'Connor <coreyoconnor@gmail.com>
Thu, 30 Sep 2010 23:07:14 +0000 (16:07 -0700)
committerCorey O'Connor <coreyoconnor@gmail.com>
Thu, 30 Sep 2010 23:07:14 +0000 (16:07 -0700)

Trivial merge