Merge reason: This is an older commit under testing that was not pushed yet - merge it.

Also fix up the merge in command-list.txt.
Signed-off-by: NIngo Molnar <mingo@elte.hu>
Acked-by: NTom Zanussi <tzanussi@gmail.com>