Merge branch 'refs/heads/FileIO-jose' into FileIO

Conflicts:
	css/ninja.css
	js/controllers/document-controller.js

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

1 files changed, 6 insertions, 0 deletions

diff --git a/node_modules/montage/ui/scroll.js b/node_modules/montage/ui/scroll.js
index 3126ae1c..bf1ea7f2 100755
--- a/node_modules/montage/ui/scroll.js
+++ b/node_modules/montage/ui/scroll.js
@@ -1,3 +1,9 @@
+/* <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,
     defaultEventManager = require("core/event/event-manager").defaultEventManager;