Merge branch 'master' of gerrit.public:scm/meta/git
authorAlexander Kanevskiy <kad@linux.intel.com>
Fri, 13 Jun 2014 09:14:49 +0000 (12:14 +0300)
committerAlexander Kanevskiy <kad@linux.intel.com>
Fri, 13 Jun 2014 09:14:49 +0000 (12:14 +0300)

Trivial merge