Spirit: merge from trunk

[SVN r68078]
This commit is contained in:
Hartmut Kaiser
2011-01-13 02:11:19 +00:00
parent a29c3edc9b
commit 1614645b5c