Merge branch 'tizen' of ssh://review.tizen.org:29418/profile/ivi/cowhide into tizen
authorSalvatore Iovene <salvatore@iovene.com>
Fri, 14 Feb 2014 09:27:42 +0000 (11:27 +0200)
committerSalvatore Iovene <salvatore@iovene.com>
Fri, 14 Feb 2014 09:27:42 +0000 (11:27 +0200)
Conflicts:
lib/lodash


Trivial merge