Merge remote-tracking branch 'upstream/master'
Bumped the version number from 2.6 to 3.x, which is to be used in the development branch
Have CBM DOS filetype of imported files match the one used by cc65.

CFS_WRITE implies O_TRUNC which is implemented on CBM DOS by deleting an
exsisting file. Hoewever this succeeds only if the CBM DOS filetype matches.

We need a working O_TRUNC in order to be able to overwrite the contiki.cfg
configuration file.

Note: Now it has be clarified why overwriting the configuration file started to
fail the CBM PFS (platform file system) can be activated for the recently added
ethconfig program.
Merge remote-tracking branch 'upstream/master'
Merge pull request #501 from oliverschmidt/master

Have CBM DOS filetype of imported files match the one used by cc65.
Merge pull request #498 from adamdunkels/push/contiki-3.x

Bump the version number in the development branch