Merge branch 'stable-2.2' into devel-2.2
authorGuido Trotter <ultrotter@google.com>
Thu, 9 Dec 2010 15:12:18 +0000 (16:12 +0100)
committerGuido Trotter <ultrotter@google.com>
Thu, 9 Dec 2010 15:12:28 +0000 (16:12 +0100)
* stable-2.2:
  Fix rename for file-backed instances

Signed-off-by: Guido Trotter <ultrotter@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>


Trivial merge