Merge mainline (v2.6.34-rc7)
authorHenrique de Moraes Holschuh <hmh@hmh.eng.br>
Sun, 16 May 2010 22:40:56 +0000 (19:40 -0300)
committerHenrique de Moraes Holschuh <hmh@hmh.eng.br>
Sun, 16 May 2010 22:40:56 +0000 (19:40 -0300)

Trivial merge