[jeff@arch trunk]$ git rebase -s subtree master origin/master
First, rewinding head to replay your work on top of it...
Auto-merging pyserver/trunk/aaa/model/assets.py
Already applied: 0001 Remove stray "pass" command, originally inserted for debugging
Auto-merging pyserver/trunk/aaa/model/assets.py
Already applied: 0002 Fix records to give to assets the expected value, don't unroll the ...
Already applied: 0003 Raise a TypeError if we don't get an int or long for asset_id