Whamcloud - gitweb
Merge trivial changes from branch to head.