[500d32]: Merge branch 'bug-7209-DataStorageTest'

Conflicts:
Core/Code/Testing

Merged commits:

2011-03-23 15:53:04 Alexander Seitel [03e90b]
Fixed commit not belonging to this bug.

2011-03-23 15:49:18 Alexander Seitel [6fa457]
fixed merge conflicts

2011-03-23 15:06:44 Alexander Seitel [15103a]
Fixed DataStorageTest and used command argument for test image

[5af162]: Merge branch 'bug-7209-DataStorageTest'

Conflicts:
Core/Code/Testing

Merged commits:

2011-03-23 16:34:44 Alexander Seitel [be6e6b]
Fixed spelling error

[ed788f]: Merge branch 'bug-7209-DataStorageTest'

Merged commits:

2011-03-23 16:49:52 Alexander Seitel [da7dc6]
Removed code related to StandardFileLocation

Testing bugs are part of their respective modules -> changing component to other, please assign appropriate component.