Test j2k
logic typo fix
Merge branch 'master' of https://github.com/dvska/Pillow into cleanup
Merge commit '329fd00d3fe2709c043c73e075da03b6d9729a2b' into cleanup
Cherry-pick of portions of patch a500ca13933183fa845f09762fc2948fbfe409f1, many shortcut ops added, no functional changes
Merge from master, pre-unittest conversion
Merge branch 'cleanup' of https://github.com/wiredfool/Pillow into wiredfool-cleanup

Conflicts:
	Tests/test_file_jpeg2k.py
	Tests/test_image_transform.py
	Tests/test_imagesequence.py
Merge pull request #654 from wiredfool/cleanup

Thanks.