Merge remote-tracking branch 'mjb/freq_menu'
authorKeith Packard <keithp@keithp.com>
Sat, 1 Sep 2012 03:24:16 +0000 (22:24 -0500)
committerKeith Packard <keithp@keithp.com>
Sat, 1 Sep 2012 03:24:16 +0000 (22:24 -0500)

Trivial merge