Merge branch 'master' of git://gitorious.org/baulk/mainline
commit5370964681240bd44d64925a121019d6bae02370
authorJacob Alexander <hyatt@901Mas.localdomain>
Thu, 23 Oct 2008 07:41:01 +0000 (23 00:41 -0700)
committerJacob Alexander <hyatt@901Mas.localdomain>
Thu, 23 Oct 2008 07:41:01 +0000 (23 00:41 -0700)
treee246922a171e7dd6074408a2539fb79ecc8a1cb3
parent5dc872ea4d7c1c2d8b55e1e38fb009b0a9d9ab67
parent08486609148352bba2503a164555377f068d019a
Merge branch 'master' of git://gitorious.org/baulk/mainline