commit 5e8b47d7c99dc311bf5bbe7d44808bf02b8116ea Merge: d8e27ac eb89764 Author: Ingvar Hagelund <ingvar at redpill-linpro.com> Date: Wed Nov 24 12:06:04 2010 +0100 Merge branch 'el6' ---