Merge branch master into tizen_2.1
authorTelle-Tiia Pitkänen <telle-tiia.pitkanen@ixonos.com>
Tue, 16 Apr 2013 11:24:20 +0000 (14:24 +0300)
committerTelle-Tiia Pitkänen <telle-tiia.pitkanen@ixonos.com>
Tue, 16 Apr 2013 11:24:20 +0000 (14:24 +0300)
commit5cc235fa24f67e509fd1a25c1604d9b219b8cf70
tree0a635366eb3ed6e6d1c9791e777b4263f089c211
parentaa36bb9f803b66c9f5ac134a1b8b6fe0ef05c2b4
parentcfc246a1d05b588bd0169c21e8d1df6d6faf005c
Merge branch master into tizen_2.1

Conflicts:
packaging/gst-plugins-atomisp.changes

Change-Id: Ibbf47e7837b0ec92f03c787b39e6eb0600a9ad07