Merge from DEFAULT f1e80d00c3099a65283f143268318e504ce6ea85

see comments in issue 1052, comment 439
This commit is contained in:
michael
2012-07-25 21:24:57 -04:00
89 changed files with 6454 additions and 4740 deletions

File diff suppressed because it is too large Load Diff