Squashed commit of the following:

commit 2054551bfb01a0f4ca2e138b9d724835462d45cd
Merge: 765c2da 616a853
Author: Valerio Virgillito <valerio@motorola.com>
Date:   Wed Apr 18 13:48:21 2012 -0700

    Merge branch 'refs/heads/master' into integration

commit 765c2da8e1aa03550caf42b2bd5f367555ad2843
Author: Valerio Virgillito <valerio@motorola.com>
Date:   Tue Apr 17 15:29:41 2012 -0700

    updating the picasa carousel

    Signed-off-by: Valerio Virgillito <valerio@motorola.com>

commit 9484f1c82b81e27edf2dc0a1bcc1fa3b12077406
Merge: d27f2df cacb4a2
Author: Valerio Virgillito <valerio@motorola.com>
Date:   Tue Apr 17 15:03:50 2012 -0700

    Merge branch 'refs/heads/master' into integration

commit d27f2df4d846064444263d7832d213535962abe7
Author: Valerio Virgillito <valerio@motorola.com>
Date:   Wed Apr 11 10:39:36 2012 -0700

    integrating new picasa carousel component

    Signed-off-by: Valerio Virgillito <valerio@motorola.com>

commit 6f98384c9ecbc8abe55ccfe1fc25a0c7ce22c493
Author: Valerio Virgillito <valerio@motorola.com>
Date:   Tue Apr 10 14:33:00 2012 -0700

    fixed the text area case issue

    Text area was renamed from TextArea to Textarea

    Signed-off-by: Valerio Virgillito <valerio@motorola.com>

commit 1e83e26652266136802bc7af930379c1ecd631a6
Author: Valerio Virgillito <valerio@motorola.com>
Date:   Mon Apr 9 22:10:45 2012 -0700

    integrating montage v0.8 into ninja.

    Signed-off-by: Valerio Virgillito <valerio@motorola.com>

Signed-off-by: Valerio Virgillito <valerio@motorola.com>

1 files changed, 0 insertions, 83 deletions

diff --git a/node_modules/montage/ui/flow-path-linear.js b/node_modules/montage/ui/flow-path-linear.js
deleted file mode 100644
index 9bf83279..00000000
--- a/node_modules/montage/ui/flow-path-linear.js
+++ /dev/null
@@ -1,83 +0,0 @@
-/* <copyright>
- This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
- No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
- (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
- </copyright> */
-
-var Montage = require("montage").Montage;
-
-var FlowPathLinear = exports.FlowPathLinear = Montage.create(Montage, {
-
-    _variable: {
-        enumerable: false,
-        value: "time"
-    },
-
-    variable: {
-        get: function () {
-            return this._variable;
-        },
-        set: function (value) {
-            switch (value) {
-                case "speed":
-                case "index":
-                    this._variable = value;
-                    break;
-                default:
-                    this._variable = "time";
-            }
-            this._updatePath();
-        }
-    },
-
-    _origin: {
-        enumerable: false,
-        value: 0
-    },
-
-    origin: {
-        get: function () {
-            return this._origin;
-        },
-        set: function (value) {
-            this._origin = value;
-            this._updatePath();
-        }
-    },
-
-    _multiplier: {
-        enumerable: false,
-        value: 1
-    },
-
-    multiplier: {
-        get: function () {
-            return this._multiplier;
-        },
-        set: function (value) {
-            this._multiplier = value;
-            this._updatePath();
-        }
-    },
-
-    _path: {
-        enumerable: false,
-        value: "0"
-    },
-
-    path: {
-        get: function () {
-            return this._path;
-        },
-        set: function (value) {
-            this._path = value;
-        }
-    },
-
-    _updatePath: {
-        enumerable: false,
-        value: function () {
-            this.path = "slide."+this._variable+"*("+this._multiplier+")-("+this._origin+")";
-        }
-    }
-});