Merge branch 'master' of git://gitorious.org/baulk/mainline
commiteb910e4b37eed26cee1f98acf520d92c6b0378c7
authorJacob Alexander <hyatt@901Mas.localdomain>
Fri, 14 Nov 2008 15:33:22 +0000 (14 07:33 -0800)
committerJacob Alexander <hyatt@901Mas.localdomain>
Fri, 14 Nov 2008 15:33:22 +0000 (14 07:33 -0800)
treeb0c32c4ef015fe2e0b1ac3b2a37ae548a1db3469
parentfc58f2a1f2b7bc998e516a95f554859f0bfb8035
parent66f10a4923a061499d30703a866cb32ad5c125bb
Merge branch 'master' of git://gitorious.org/baulk/mainline