Merge branch 'upstream' into debian
authorJameson Graef Rollins <jrollins@finestructure.net>
Sun, 20 Dec 2009 16:03:19 +0000 (11:03 -0500)
committerJameson Graef Rollins <jrollins@finestructure.net>
Sun, 20 Dec 2009 16:03:19 +0000 (11:03 -0500)
commit518c8c0d3f9d845b2e5a87e83382d61b05fc2958
tree0af9ba97048d5f840d1c2a2c5f368ce2efa78ddc
parent9f99a301b158dc1ed1c8c6754db1d57e3b0becf4
parentdac01ec52036e0320f66211be3dc5e5126eb218f
Merge branch 'upstream' into debian