Merge branch 'master' into qt
authorEd Page <eopage@byu.net>
Wed, 1 Dec 2010 03:26:45 +0000 (21:26 -0600)
committerEd Page <eopage@byu.net>
Wed, 1 Dec 2010 03:26:45 +0000 (21:26 -0600)
commit304d49ade2f9b153d34f8e481464506b1b66ac95
tree5933e2ac29cff8046af3edb5b60fe1ae71f3b68f
parentbec3e07019d2142d39702df9f4dcb2d21bafdee5
parentf183dedf1245e76096c1e0000fcc4ed72e64796e
Merge branch 'master' into qt
src/backends/gvoice/gvoice.py