merge develop -D org -I include -E exclude: PR 898 (Bulk annotations for web image viewer, rebased onto develop)
merge develop -D org -I include -E exclude: PR 912 (Add Bio-Formats' turbojpeg artifact to the classpath)
merge develop -D org -I include -E exclude: PR 984 (Add more C++ tests (rebased onto develop))
merge develop -D org -I include -E exclude: PR 987 (Big image 3 (rebased onto develop))
merge develop -D org -I include -E exclude: PR 989 (Loosen prefix restrictions in FS)
merge develop -D org -I include -E exclude: PR 990 (Remove hard-coded memory settings for 64bit Java 6)
merge develop -D org -I include -E exclude

Repository: openmicroscopy/openmicroscopy
Already up-to-date.
Merged PRs:
  # PR 898 knabar 'Bulk annotations for web image viewer, rebased onto develop'
  # PR 912 melissalinkert 'Add Bio-Formats' turbojpeg artifact to the classpath'
  # PR 984 joshmoore 'Add more C++ tests (rebased onto develop)'
  # PR 987 jburel 'Big image 3 (rebased onto develop)'
  # PR 989 knabar 'Loosen prefix restrictions in FS'
  # PR 990 joshmoore 'Remove hard-coded memory settings for 64bit Java 6'
Conflicting PRs (not included):
  # PR 991 rleigh-dundee 'Add support for Ice 3.5 (develop)'

Repository: openmicroscopy/bioformats
Already up-to-date.
Merged PRs:
  # PR 159 melissalinkert 'Improve .ndpi support'
  # PR 351 ctrueden 'Add SPW support to FakeReader'
  # PR 424 qidane 'Specification changes for 2013-06 release'
  # PR 435 melissalinkert 'Fixes for March 2013 bug week (rebased onto develop)'
  # PR 438 melissalinkert 'Fix the autogenerated metadata field counts (rebased onto develop)'
  # PR 447 rleigh-dundee 'Add "schema" extlink (develop)'
Conflicting PRs (not included):
  # PR 442 mtbc 'bump AssumeNG up from 1.2.3 to 1.2.4'

Repository: ome/scripts
Already up-to-date.
Merged PRs:
  # PR 23 will-moore 'Kymograph 8206_develop'

Repository: openmicroscopy/ome-documentation
Already up-to-date.
Merged PRs:
  # PR 312 mtbc 'Minor fixes and increasing consistency in sysadmin docs. (rebase)'
  # PR 313 qidane 'Putting OME-XML formats docs into ome-docs repo (rebased onto develop)'
  # PR 314 pwalczysko 'Perm table ok develop'

Generated by SCC-merge#207 (http://hudson.openmicroscopy.org.uk/job/SCC-merge/207/)