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

Trivial merge