Merge branch 'master' of github.com:01org/murphy submit/tizen/20140110.142837
authorKrisztian Litkey <kli@iki.fi>
Fri, 10 Jan 2014 14:17:11 +0000 (16:17 +0200)
committerKrisztian Litkey <kli@iki.fi>
Fri, 10 Jan 2014 14:17:11 +0000 (16:17 +0200)

Trivial merge