Merge branch 'stable'
commitbbde9a46eecd6f35e71ec5815a4936f755f33bb6
authorJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Wed, 13 Jan 2010 21:24:46 +0000 (13 16:24 -0500)
committerJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Wed, 13 Jan 2010 21:24:46 +0000 (13 16:24 -0500)
treee5f5a5be75bafc41876616aa9d52f03a85c75beb
parentd7ff5a798da3604db7f8586372ea5da12aafbecf
parent3ce135f177c52a8b3479f02fa61362bded538797
Merge branch 'stable'