Committ before merge with Olof 28-05-13

Signed-off-by: Farbror Tiny <jens.syntax@gmail.com>