svn merge -r48944:48942 .

revert moving the file, adding a new module didnt resolve linking issue.
This commit is contained in:
Campbell Barton 2012-07-15 16:57:21 +00:00
parent 701a16c9dd
commit 8c77b35f4f