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)
commitbe9f49041e430c49125a7ea681d98d3c6fa5463c
tree19792cf01c628dbc716a2c616daab1eef05330ab
parentcdb303ab2d5b53981a1f5da0b94ff7bfb9dc7129
parent3721d2fe03ea5ee4916f8db315d90e8ba803fea5
Merge branch 'stable-2.2' into devel-2.2

* stable-2.2:
  Fix rename for file-backed instances

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