Merge remote-tracking branch 'uniarch/master' into multiarch
authorKeith Packard <keithp@keithp.com>
Fri, 7 Oct 2011 14:40:14 +0000 (08:40 -0600)
committerKeith Packard <keithp@keithp.com>
Fri, 7 Oct 2011 14:40:14 +0000 (08:40 -0600)
Conflicts:
src/core/ao_cmd.c

Use ao_arch_reboot after waiting for a second


No differences found