Merge remote-tracking branch 'kibi/master'
authorKeith Packard <keithp@keithp.com>
Tue, 27 Dec 2011 21:13:48 +0000 (13:13 -0800)
committerKeith Packard <keithp@keithp.com>
Tue, 27 Dec 2011 21:13:48 +0000 (13:13 -0800)
commit8dedf9831bd80514d800f0085213296a3726dba7
tree09b70e99d9bb70672fdf6e73a0c2537138c941a4
parentcfc4c3d7fa8bd4da4c08b2ab8e6f85435f75353a
parentcf96183122a85e3376e560f0360b38b5676e57a9
Merge remote-tracking branch 'kibi/master'