Merge branch 'master' of github.com:otcshare/policy-internal
authorKrisztian Litkey <krisztian.litkey@intel.com>
Mon, 7 Jan 2013 16:24:02 +0000 (18:24 +0200)
committerKrisztian Litkey <krisztian.litkey@intel.com>
Mon, 7 Jan 2013 16:24:02 +0000 (18:24 +0200)

Trivial merge