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)
commitf6dffa7211354be876bf14becd8c74c6a9d46e20
tree54dedfc5744c7105966c6f2a71b1d3f4f8835f82
parenteb48f7bc2860682cf89001828e0805a37b694bdd
parentd1cadf18c65bf23fb17863756400ce7d00289194
Merge local branch

Conflicts:
packaging/gst-plugins-atomisp.changes

Change-Id: I618b4221b162140d5cefb90fcee6363b5a8a4cda