Merge remote-tracking branch 'origin/master'
authorKeith Packard <keithp@keithp.com>
Tue, 8 Oct 2013 16:26:41 +0000 (09:26 -0700)
committerKeith Packard <keithp@keithp.com>
Tue, 8 Oct 2013 16:26:41 +0000 (09:26 -0700)
commit488a527267decece48e6682e0e0c7fc29cbed329
tree15f90c050ad470528af9f7d00ad2a7e2bb7fd47c
parent6a1e398e590121458176758858bb4210f3eb5a55
parentf6661cc015e1a92450dc3eede97d66005f69cc72
Merge remote-tracking branch 'origin/master'

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