From: adam <adamansky@gmail.com>
Date: Wed, 17 Jul 2013 11:36:09 +0000 (+0700)
Subject: Merge remote-tracking branch 'origin/master' into jsonexport
X-Git-Tag: v1.2.12~276
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=35a62ca953555cb58c7ea510d78f3dcdd23bce18;p=platform%2Fupstream%2Fejdb.git

Merge remote-tracking branch 'origin/master' into jsonexport
---

35a62ca953555cb58c7ea510d78f3dcdd23bce18