Merge branch 'master' of github.com:otcshare/murphy
authorKrisztian Litkey <krisztian.litkey@intel.com>
Wed, 20 Jun 2012 16:40:15 +0000 (19:40 +0300)
committerKrisztian Litkey <krisztian.litkey@intel.com>
Wed, 20 Jun 2012 16:40:15 +0000 (19:40 +0300)

Trivial merge