Automatically built.

commit b513ae70f8b81cba132504555f6914f6417ea383
Merge: d5e6e09 77aef09
Author: Brian Jordan <bcjordan@gmail.com>
Date:   Thu Dec 18 13:20:16 2014 -0800

    Merge pull request #870 from code-dot-org/position_trashcan_function_editor

    Position trashcan properly in the non-MSM function editor

commit 77aef09afc5c86c08e9578829961928c302f57d2
Merge: a43758a d5e6e09
Author: Brian Jordan <bcjordan@gmail.com>
Date:   Thu Dec 18 13:17:59 2014 -0800

    Merge remote-tracking branch 'origin/development' into position_trashcan_function_editor

    Conflicts:
    	blockly-core/core/function_editor.js

commit a43758afc3eb3d7dca3b74abe7ce8b5cef689b8f
Author: Brian Jordan <bcjordan@gmail.com>
Date:   Thu Dec 18 13:09:19 2014 -0800

    Position the trashcan in the non-MSM function editor