[systemtap/f16: 3/3] The branches shall be as one!

[Josh Stone]

commit 349baef65499858e5ffac91c3d916a0f55d0893a
Merge: 134727e 41f265f
Author: Josh Stone <jistone at redhat.com>
Date:   Wed Jul 11 14:52:35 2012 -0700

    The branches shall be as one!
    
    aka Merge branches 'f16' and 'f17'

---