From: Telle-Tiia Pitkänen <telle-tiia.pitkanen@ixonos.com>
Date: Wed, 10 Apr 2013 10:41:10 +0000 (+0300)
Subject: Merge local branch
X-Git-Tag: 2.1b_release~2^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f6dffa7211354be876bf14becd8c74c6a9d46e20;p=adaptation%2Fintel_mfld%2Fgst-plugins-atomisp.git

Merge local branch

Conflicts:
	packaging/gst-plugins-atomisp.changes

Change-Id: I618b4221b162140d5cefb90fcee6363b5a8a4cda
---

f6dffa7211354be876bf14becd8c74c6a9d46e20