Merge branch 'master' of github.com:otcshare/policy-internal
authorKrisztian Litkey <krisztian.litkey@intel.com>
Tue, 11 Dec 2012 14:23:44 +0000 (16:23 +0200)
committerKrisztian Litkey <krisztian.litkey@intel.com>
Tue, 11 Dec 2012 14:23:44 +0000 (16:23 +0200)

Trivial merge