Merge branch 'master' of github.com:otcshare/policy-internal
authorKrisztian Litkey <krisztian.litkey@intel.com>
Fri, 4 Jan 2013 14:58:16 +0000 (16:58 +0200)
committerKrisztian Litkey <krisztian.litkey@intel.com>
Fri, 4 Jan 2013 14:58:16 +0000 (16:58 +0200)

Trivial merge