merge 2.7 release

This commit is contained in:
Benjamin Peterson 2012-02-23 15:19:08 -05:00
commit d8f4118f9b
1 changed files with 77 additions and 83 deletions

File diff suppressed because one or more lines are too long