Merge branch 'stable'
commit0f8742e7c1d2932aa00d04533d3f7a231830f0d0
authorJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Fri, 18 Sep 2009 02:09:05 +0000 (17 22:09 -0400)
committerJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Fri, 18 Sep 2009 02:09:05 +0000 (17 22:09 -0400)
tree5fcab4f759ba0bde9d795e6f62f6f9823d55c262
parent664b10396f7669e89f919bf0ecbd4e489a74e0ff
parent56f239018df9a24a62a649f10de70bac072e1a16
Merge branch 'stable'