Merge branch 'master' into 0.9.1

This commit is contained in:
Christophe Riccio
2010-12-21 01:25:58 +00:00
3 changed files with 2663 additions and 2629 deletions

File diff suppressed because it is too large Load Diff