Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures

Conflicts:
	js/lib/geom/geom-obj.js
	js/lib/geom/rectangle.js
	js/tools/TagTool.js

1 files changed, 0 insertions, 20 deletions

diff --git a/node_modules/montage/ui/picasa-carousel.reel/image.reel/image.js b/node_modules/montage/ui/picasa-carousel.reel/image.reel/image.js
deleted file mode 100644
index 0bced41b..00000000
--- a/node_modules/montage/ui/picasa-carousel.reel/image.reel/image.js
+++ /dev/null
@@ -1,20 +0,0 @@
-var Montage = require("montage").Montage,
-    Component = require("ui/component").Component;
-
-var Image = exports.Image = Montage.create(Component, {
-
-    _src: {value: null},
-
-    src: {
-        set: function(value) {
-            this._src = value;
-            this.needsDraw = true;
-        }
-    },
-
-    draw: {
-        value: function() {
-            this._element.style.backgroundImage = "url(" + this._src + ")";
-        }
-    }
-});