Merge from trunk

This commit is contained in:
Raoul Snyman 2009-09-13 20:45:56 +02:00
commit 3090aa489b
22 changed files with 2722 additions and 2722 deletions