Merge "Common inventory file format example"
authorTim Rozet <trozet@redhat.com>
Wed, 23 Dec 2015 19:50:11 +0000 (19:50 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Wed, 23 Dec 2015 19:50:11 +0000 (19:50 +0000)

Trivial merge