Merge commit 'ad431ad8631d8b19b04193ff1f89a955a7643c60' into eclair-mr2 * commit 'ad431ad8631d8b19b04193ff1f89a955a7643c60': Fix pairings lost on reboot.