merge of changes from trunk

[SVN r46642]
This commit is contained in:
Thorsten Jørgen Ottosen 2008-06-24 14:18:54 +00:00
parent ee51129bdb
commit 58a913cf6a

@ -1 +1 @@
Subproject commit b8dfbb0f18bb47add9c77bcfd6dd3de39ffbc597
Subproject commit 00cd07dae3c86397ae50b368782e4a37df80dbf2