2 Commits

Author	SHA1	Message	Date
Simen Svale Skogsrud	48b596c2fe	added code with merge conflict as note to self, accelleration will just have to wait	2010-12-20 14:01:38 +01:00
Simen Svale Skogsrud	ddcdce2640	minor revision	2010-01-04 16:09:00 +01:00