Merge branch 'binding' of github.com:dhg637/ninja-internal into binding

Conflicts:
	js/stage/binding-view.reel/binding-view.js

1 files changed, 2 insertions, 2 deletions

diff --git a/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.html b/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.html
index f7c8a766..dc70a19c 100755
--- a/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.html
+++ b/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.html
@@ -12,7 +12,7 @@
     <script type="text/montage-serialization">
     {
         "owner": {
-            "prototype": "montage-google/picasa-carousel.reel",
+            "prototype": "picasa-carousel.reel",
             "properties": {
                 "element": {"#": "montage-google-picasa-carousel"},
                 "flow": {"@": "flow"}
@@ -29,7 +29,7 @@
             }
         },
         "image": {
-            "prototype": "montage-google/picasa-carousel.reel/image.reel",
+            "prototype": "picasa-carousel.reel/image.reel",
             "properties": {
                 "element": {"#": "image"}
             },