Merge branch 'master' of git://gitorious.org/baulk/mainline
commit6173def972d59517d46416fa57c4725fa0e79dd4
authorJacob Alexander <hyatt@901Mas.localdomain>
Fri, 7 Nov 2008 01:36:33 +0000 (6 17:36 -0800)
committerJacob Alexander <hyatt@901Mas.localdomain>
Fri, 7 Nov 2008 01:36:33 +0000 (6 17:36 -0800)
tree4e0f05d6cd2fde4fc1c9b628d34928833dadc6f5
parent6a131d2a704d62983149bba27dcaed007e0609e9
parentccee9f8dc37df3693881193b8f13164ccd15eba1
Merge branch 'master' of git://gitorious.org/baulk/mainline