Merge remote-tracking branch 'mjb/prefs_interface'
authorKeith Packard <keithp@keithp.com>
Thu, 20 Sep 2012 09:30:11 +0000 (11:30 +0200)
committerKeith Packard <keithp@keithp.com>
Thu, 20 Sep 2012 09:30:11 +0000 (11:30 +0200)
commite69a433fd93b9f6bd2297d8045eb075fee29e73b
tree93a47e78282df5e2ee47c11afa2e772d2cbfd3bb
parent19243ecc9b5bbdcc069ae24acf1ca807322c84d8
parent6e0d672b8a516a604d8ea1abd2bed113c608143f
Merge remote-tracking branch 'mjb/prefs_interface'