Merge branch 'buttonbox'
authorKeith Packard <keithp@keithp.com>
Thu, 25 Nov 2010 05:00:52 +0000 (21:00 -0800)
committerKeith Packard <keithp@keithp.com>
Thu, 25 Nov 2010 05:00:52 +0000 (21:00 -0800)
commit51c7741040d95c5deece939dae5e4136cc04afc4
tree96631ee5aa9fd0c8c45f019ff154cc4fc8ca85d0
parentd1dbe3b69e6f95ef8ecd4cf959863b922ab47c66
parent4e47c44d335276cf0dc5ed3a0756e50c98c1b9b9
Merge branch 'buttonbox'

Conflicts:
doc/telemetrum-doc.xsl

Pull the buttbox version of the docs in as it had been updated.

Signed-off-by: Keith Packard <keithp@keithp.com>