merge changes from pandora

This commit is contained in:
j 2010-09-05 14:59:24 +02:00
commit 0a63490697
3 changed files with 863 additions and 1696 deletions

File diff suppressed because it is too large Load diff