Attempting to fix the merge conflict.
Attempting to fix the merge conflict.

git-svn-id: fc3380143ce617d5e9d0259a5815bc564ab5af89@1037435 b8457f37-d9ea-0310-8a92-e5e31aec5664

mikelking/Ajax-Heartbeat-Tool