Squashed commit of the following:

commit 6d7b7a089d8b41850a448927e7084cba3d7d1a22
Author: Martin Nolstedt <martin.nolstedt@lodon.se>
Date:   Thu Jan 31 16:24:50 2013 +0100

    m3

commit 7937d0c96f4ae876feab81cfe66dbd4d7da89baa
Author: Martin Nolstedt <martin.nolstedt@lodon.se>
Date:   Thu Jan 31 16:24:09 2013 +0100

    m2

commit ee0f4fcba1dcb37603a8976a89ecbbc20f2e2c95
Author: Martin Nolstedt <martin.nolstedt@lodon.se>
Date:   Thu Jan 31 16:23:57 2013 +0100

    m1