Merge local branch
authorTelle-Tiia Pitkänen <telle-tiia.pitkanen@ixonos.com>
Wed, 10 Apr 2013 10:41:10 +0000 (13:41 +0300)
committerTelle-Tiia Pitkänen <telle-tiia.pitkanen@ixonos.com>
Wed, 10 Apr 2013 10:43:36 +0000 (13:43 +0300)
Conflicts:
packaging/gst-plugins-atomisp.changes

Change-Id: I618b4221b162140d5cefb90fcee6363b5a8a4cda


Trivial merge