[Commits] [fluid-project/infusion] a29adc: Merge remote-tracking branch 'amb26/FLUID-4428'

[noreply at github.com]

  Branch: refs/heads/master
  Home:   https://github.com/fluid-project/infusion

  Commit: a29adc3ebd03ea650d67e3e9981f106474713191
      https://github.com/fluid-project/infusion/commit/a29adc3ebd03ea650d67e3e9981f106474713191
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2011-09-07 (Wed, 07 Sep 2011)

  Changed paths:
    M src/webapp/components/uiOptions/js/UIOptions.js
  M src/webapp/tests/component-tests/uiOptions/js/FullNoPreviewUIOptionsTests.js

  Log Message:
  -----------
  Merge remote-tracking branch 'amb26/FLUID-4428'

* amb26/FLUID-4428:
  FLUID-4428: Fix and test case for failure to apply "direct options". As a result of a failure in merging, it is necessary to give different namespaces to the events so one listener in the test case does not overwrite the other - but the test demonstrates that both are at least now being taken into account in the merging process.