Merge branch 'master' of gerrit.public:scm/meta/git
authorAlexander Kanevskiy <kad@linux.intel.com>
Sun, 15 Dec 2013 22:09:21 +0000 (00:09 +0200)
committerAlexander Kanevskiy <kad@linux.intel.com>
Sun, 15 Dec 2013 22:09:21 +0000 (00:09 +0200)

Trivial merge