Merge branch 'master' of gerrit.public:scm/meta/git
authorAlexander Kanevskiy <kad@linux.intel.com>
Thu, 5 Jun 2014 12:19:00 +0000 (15:19 +0300)
committerAlexander Kanevskiy <kad@linux.intel.com>
Thu, 5 Jun 2014 12:19:00 +0000 (15:19 +0300)

Trivial merge