Merge branch 'fix-double-load'
commit57c5afd69c4c70ad85676bab32150d6182a3def9
authorDan McGee <dan@archlinux.org>
Wed, 12 Jan 2011 03:20:10 +0000 (11 21:20 -0600)
committerDan McGee <dan@archlinux.org>
Wed, 12 Jan 2011 03:20:10 +0000 (11 21:20 -0600)
treed0205a02cf32351441f32c37a954890e1a76b6dc
parent0284cf2128eb0179a3598ee21a951c5b3c11be40
parent33240e87b99e5aebd0e64a672ea307a698edb32f
Merge branch 'fix-double-load'