Merge branch 'various-fixes' into next
authorJean Privat <jean@pryen.org>
Tue, 15 Feb 2011 13:52:54 +0000 (08:52 -0500)
committerJean Privat <jean@pryen.org>
Tue, 15 Feb 2011 13:52:54 +0000 (08:52 -0500)
commit5b3f929a88328097df368de029535049b0ccd1e8
tree201d358f7182dac178bf7d5e9fd43a5a57e0a713
parenteff34adbd160716365655a25851a2019ba266d7d
parentbd5450e8e4c681f0237a69d737427421b994c228
Merge branch 'various-fixes' into next