Patch Set 12: Looks good to me, but someone else must approve; Build Successful; IP review completed

- rebased and resolved conflicts
- adapted to junit 4
- flipped versions to 0.11
- verified on Mac OSX 10.6.6