Merge remote-tracking branch 'kibi/master'
authorKeith Packard <keithp@keithp.com>
Tue, 7 Jun 2011 19:31:15 +0000 (12:31 -0700)
committerKeith Packard <keithp@keithp.com>
Tue, 7 Jun 2011 19:31:15 +0000 (12:31 -0700)
commit02d11af01211da55e9d93fe0e1851a0c6fe57472
tree7569f7028fdd012da1fd1d3f6a8ccbe546fb07af
parentbf9fd0a83eef771ee018438f05e2d9f20b43539b
parentab0df72cd33f011cc48736cfbfce9bbe9c359a80
Merge remote-tracking branch 'kibi/master'