From: jarkkos <jarkko.sakkinen@iki.fi>
Date: Fri, 11 Nov 2011 14:01:58 +0000 (-0800)
Subject: Merge pull request #1 from brianmcgillion/master
X-Git-Tag: accepted/trunk/20130107.204027~42
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=368288d0aee323ed532162b123623f900131e3e4;p=platform%2Fupstream%2Fsmack.git

Merge pull request #1 from brianmcgillion/master

Commits as agreed
---

368288d0aee323ed532162b123623f900131e3e4