Merge branch 'master' into brushtool

Conflicts:
	js/controllers/elements/shapes-controller.js

1 files changed, 21 insertions, 0 deletions

diff --git a/node_modules/montage/ui/feed-reader/feed-entry.reel/feed-entry.js b/node_modules/montage/ui/feed-reader/feed-entry.reel/feed-entry.js
new file mode 100644
index 00000000..72c5023e
--- /dev/null
+++ b/node_modules/montage/ui/feed-reader/feed-entry.reel/feed-entry.js
@@ -0,0 +1,21 @@
+/* <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,
+    Component = require("ui/component").Component;
+
+exports.FeedEntry = Montage.create(Component, {
+
+    _entry: {value: null},
+    entry: {
+        get: function() {
+            return this._entry;
+        },
+        set: function(value) {
+            this._entry = value;            
+        }
+    }
+    
+});