From: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Date: Thu, 5 Dec 2013 18:41:58 +0000 (+0200)
Subject: Merge branch 'v1.0.x'
X-Git-Tag: v1.1.0~26
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b6fc6494ea9165657918f5955dabc98c40a3320d;p=platform%2Fupstream%2Fsmack.git

Merge branch 'v1.0.x'
---

b6fc6494ea9165657918f5955dabc98c40a3320d