Merge commit 'origin'; branch 'master' into ditto
commitd05405a90ec138b09f625d27983d4011e666cef2
authorStephen Lombardo <sjlombardo@zetetic.net>
Sun, 6 Dec 2009 19:14:36 +0000 (6 14:14 -0500)
committerStephen Lombardo <sjlombardo@zetetic.net>
Sun, 6 Dec 2009 19:14:36 +0000 (6 14:14 -0500)
treed9338f2e91ca757a83b1c9ca54c0e2d7decff707
parentb66dd49202c34576bfacc7afe105ec6b1cd64fb2
parentc969c4fcfaf61328e38b039ab0565cbf7f0c7992
Merge commit 'origin'; branch 'master' into ditto