Merge branch 'refs/heads/NinjaInternal' into FileIO

Conflicts:
	.gitignore
	js/ninja.reel/ninja.js

2 files changed, 5 insertions, 11 deletions

diff --git a/node_modules/montage/ui/scroll-bars.reel/scroll-bars.html b/node_modules/montage/ui/scroll-bars.reel/scroll-bars.html
index a9d92944..93986b5d 100755
--- a/node_modules/montage/ui/scroll-bars.reel/scroll-bars.html
+++ b/node_modules/montage/ui/scroll-bars.reel/scroll-bars.html
@@ -114,4 +114,4 @@
         </div>
     </div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/node_modules/montage/ui/scroll-bars.reel/scroll-bars.js b/node_modules/montage/ui/scroll-bars.reel/scroll-bars.js
index 48b6a4c9..4a954399 100755
--- a/node_modules/montage/ui/scroll-bars.reel/scroll-bars.js
+++ b/node_modules/montage/ui/scroll-bars.reel/scroll-bars.js
@@ -1,9 +1,3 @@
-/* <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;
 
@@ -75,7 +69,7 @@ var ScrollBars = exports.ScrollBars = Montage.create(Component, {
         enumerable: false,
         value: 0
     },
-    
+
     opacity: {
         get: function () {
             return this._opacity;
@@ -85,7 +79,7 @@ var ScrollBars = exports.ScrollBars = Montage.create(Component, {
             this.needsDraw = true;
         }
     },
-    
+
     _isDisplayUpdated: {
         enumerable: false,
         value: false
@@ -174,7 +168,7 @@ var ScrollBars = exports.ScrollBars = Montage.create(Component, {
                 this._bottomClip.style.height = this._bottom.style.height = (this._offsetHeight - 4) + "px";
                 this._bottomClip.style.clip = "rect(3px,6px," + (this._offsetHeight - 3) + "px,-1px)";
                 this._hasResizedVertical = false;
-            }            
+            }
             if (this._opacity) {
                 if (this._displayHorizontal) {
                     range = this._offsetWidth - 9 - (this._displayVertical ? 6 : 0);
@@ -244,4 +238,4 @@ var ScrollBars = exports.ScrollBars = Montage.create(Component, {
             }
         }
     }
-});
\ No newline at end of file
+});