more changes from trunk

[SVN r46652]
This commit is contained in:
Thorsten Jørgen Ottosen 2008-06-24 15:42:48 +00:00
parent f0abfdeca9
commit d96bb811d7

@ -1 +1 @@
Subproject commit b4f99d66b590ad1d8bb66211450fd62ed202b873
Subproject commit e7902d439b1e86d1df5038001e0142b59ebb7e52