Merge remote-tracking branch 'origin/master'
authorKeith Packard <keithp@keithp.com>
Sat, 28 Sep 2013 06:09:47 +0000 (23:09 -0700)
committerKeith Packard <keithp@keithp.com>
Sat, 28 Sep 2013 06:09:47 +0000 (23:09 -0700)
commit4afe942a6cf957833dfc5311a71883d038b8c824
treed7378f1d5316649b068cc9c1bf507c1f316cd55f
parent5d498f56ef1eda05469654fda9c4e5c78f5587ab
parentd0390a1050d1ab4a267857275d4a72c995a7530d
Merge remote-tracking branch 'origin/master'

Conflicts:
packages/Makefile
packages/Makefile