Merge branch 'sersync'
commitf7fa44d6001b0c104cbf209cd7455e536e02cbe9
authorAndrew Arnott <andrewarnott@gmail.com>
Sun, 21 Sep 2008 02:18:00 +0000 (20 19:18 -0700)
committerAndrew <andrewarnott@gmail.com>
Sun, 21 Sep 2008 02:18:00 +0000 (20 19:18 -0700)
treef6739f0963a031b3d7155719a7dd302bab383666
parentc9304587876374c2866f44135cf24372f432a77d
parentf7326ec97ead94425cf8b22d0aea5f7bf67ebc8f
Merge branch 'sersync'