bugfix: use correct yml format
Merge branch 'release/20130323-release-4'

* release/20130323-release-4:
  bugfix: use correct yml format