Merge branch 'master' of github.com:otcshare/policy-internal
authorKrisztian Litkey <krisztian.litkey@intel.com>
Fri, 31 May 2013 13:46:11 +0000 (16:46 +0300)
committerKrisztian Litkey <krisztian.litkey@intel.com>
Fri, 31 May 2013 13:46:11 +0000 (16:46 +0300)

Trivial merge