REBASED MASTER BRANCH

[Sascha Hauer]

I rebased the master branch to reflect the correct version. I also
uploaded a new tarball. I hope everything is correct now.

I'm really sorry for the inconvenience.

Sascha

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |