commit 2fe8db8961683b54c2d3b001097e80b0d189264b
Merge: dbb2e6d... 0255db2...
Author: Adam Atomic <adam@adamatomic.com>
Date:   Tue Nov 16 18:14:35 2010 -0600

    Merge branch 'master' of ssh://semisecret.macminicolo.net/var/git/eric/gravityhookhd

commit dbb2e6d60118c810da183bdabf30e1471105bb29
Author: Adam Atomic <adam@adamatomic.com>
Date:   Tue Nov 16 18:14:31 2010 -0600

    trying to fix stupid merge problem

commit 0255db22072266fcde522e53a7ab179cf29a770d
Author: Eric Johnson <eric@semisecretsoftware.com>
Date:   Tue Nov 16 18:05:30 2010 -0600

    fixed sound fx bug - must compile for thumb, why?

commit 1cc7c43cb982bbe58024c09e0cebbd6b924f8189
Merge: ad5ef6f... 26c1348...
Author: Adam Atomic <adam@adamatomic.com>
Date:   Tue Nov 16 17:03:32 2010 -0600