Merge branch 'pu/2013.03-modelconfig-hr/inventory'
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 5 Jun 2013 14:32:21 +0000 (16:32 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 5 Jun 2013 14:32:21 +0000 (16:32 +0200)

Trivial merge