Merge branch 'stable-2.11' into master

[Hrvoje Ribicic]

commit 0bcff6d201b8189508c4ee6dbc6e16999ab8978a
Merge: a07ae57 67f3ee8
Author: Hrvoje Ribicic <r...@google.com>
Date:   Wed Mar 12 10:49:10 2014 +0000

    Merge branch 'stable-2.11' into master

    * stable-2.11
       Rename compression option in gnt-backup export

    Signed-off-by: Hrvoje Ribicic <r...@google.com>