# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1290894790 0
# Node ID d50bf9f55ff92f9a999ed5e08e4a4600fd53db66
# Parent  aa7bf12a56685e68779f438fe9db43a8bb8f9ed2# Parent  13600f0d56b5c4372127c088dde0e6c61562156a
Merge with trunk

diff -r 13600f0d56b5 -r d50bf9f55ff9 core/storagemanager.lua
--- a/core/storagemanager.lua	Sun Nov 28 02:42:02 2010 +0500
+++ b/core/storagemanager.lua	Sat Nov 27 21:53:10 2010 +0000
@@ -1,5 +1,5 @@
 
-local error = error;
+local error, type = error, type;
 local setmetatable = setmetatable;
 
 local config = require "core.configmanager";