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

Trivial merge