merged with upstream

This commit is contained in:
Jonas Bonér 2010-11-02 21:18:31 +01:00
commit cbca588248
8 changed files with 915 additions and 1549 deletions