From: Stef Walter <stef@memberwebs.com>
Date: Sat, 12 Jun 2010 23:45:33 +0000 (+0000)
Subject: Merge branch 'master' into gpg-agent
X-Git-Tag: split~264^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e167f9b89c58616c7416899f4f43a2c38a51ddd3;p=platform%2Fupstream%2Fgcr.git

Merge branch 'master' into gpg-agent
---

e167f9b89c58616c7416899f4f43a2c38a51ddd3