Merging to new upstream version 2.2
Merging to new upstream version 2.2

staute/shinken_deb,staute/shinken_package,staute/shinken_deb,kaji-project/shinken,kaji-project/shinken,staute/shinken_deb,staute/shinken_package,kaji-project/shinken,staute/shinken_deb,staute/shinken_package,kaji-project/shinken,staute/shinken_package,kaji-project/shinken,kaji-project/shinken,staute/shinken_deb,staute/shinken_package,kaji-project/shinken,staute/shinken_deb,staute/shinken_package