Merge branch 'master' into topic/exporter_init_meta
authorDave Rolsky <autarch@urth.org>
Mon, 7 Sep 2009 15:42:47 +0000 (10:42 -0500)
committerDave Rolsky <autarch@urth.org>
Mon, 7 Sep 2009 15:42:47 +0000 (10:42 -0500)
commitbaf282d2668cbdd8c3a452ba41589aa1bca7afb1
treed0987c8cba43de894682713ed3d31124202f4905
parent95056a1ecd68b4e3b63c08dfda4d3d10a8ba0e0f
parent39e17fefc57ae6d0a5c495e1fe7d90cdef1694c5
Merge branch 'master' into topic/exporter_init_meta