Merge remote-tracking branch 'linus/master' into testing
authorSage Weil <sage@inktank.com>
Thu, 15 Aug 2013 18:11:45 +0000 (11:11 -0700)
committerSage Weil <sage@inktank.com>
Thu, 15 Aug 2013 18:11:45 +0000 (11:11 -0700)

Trivial merge