py152-backport-branch merged with optik-1_4

I just finished updating the py152-backport-branch with the changes in
optik-1_4. 
I hope I didn't mess up the CVS repository too badly. 8-). (I didn't
*try* to touch
anything outside of the branch.)

I also did some refactoring in test/test_optik.py (which I think has
disappeared 
from HEAD) to make the test cases easier to maintain.  I would like to
complete 
this refactoring and merge it into the trunk (probably after Christmas).

-- Terrel

btw: I am using subversion now for my own development. It is very cool!
http://subversion.tigris.org/project_status.html


-- 
http://fastmail.fm - I mean, what is it about a decent email service?


-------------------------------------------------------
This SF.NET email is sponsored by: Order your Holiday Geek Presents Now!
Green Lasers, Hip Geek T-Shirts, Remote Control Tanks, Caffeinated Soap,
MP3 Players,  XBox Games,  Flying Saucers,  WebCams,  Smart Putty.
T H I N K G E E K . C O M       http://www.thinkgeek.com/sf/