Sync with the changes pushed by Serge in the last merge window.
authorJames Morris <james.l.morris@oracle.com>
Wed, 16 Jul 2014 16:10:27 +0000 (02:10 +1000)
committerJames Morris <james.l.morris@oracle.com>
Wed, 16 Jul 2014 16:10:27 +0000 (02:10 +1000)
commitbd89bb78f35fd175db7a9cfc504d789b6ca0f7b0
treedee9f8b31f3d6d2fb141541da88e1cc1329b017e
parentf01387d2693813eb5271a3448e6a082322c7d75d
parent1795cd9b3a91d4b5473c97f491d63892442212ab
Sync with the changes pushed by Serge in the last merge window.