Merge branch 'debian' into wheezy
drwxr-xr-x - debian
-rwxr-xr-x 5186 update-openrocket