Patch for bug 2417042, since &*^ing sourceforge won't let me attach files there.
Patch for bug 2417042
Clean up a bad merge. It seems the intent was to have separate bugfix and cleanup patches, but the bugfix patch was never backed out before submitting the cleanup patch. This patch simply fixes the bad merge and adds the intended bugfix to the getPluginDeps function which had a spurious blank return argument.
Spurious blank return was added in revision 2165.
The 2165 commit message is very obtuse, hard to know the author's intention.