[Commit-gnuradio] git://gnuradio.org/gnuradio branch, next, updated. v3.6.2-619-g0154c13

[git version control]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "git://gnuradio.org/gnuradio".

The branch, next has been updated
       via  0154c13c5e7a97a9ae1e93f882a0ef0cc65c6781 (commit)
       via  d3ad5ccae7f261654508d93815cb7e3d2112c4c5 (commit)
      from  c80e12c781db84cc9c6f7a17555a128e2aaf3433 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0154c13c5e7a97a9ae1e93f882a0ef0cc65c6781
Merge: c80e12c d3ad5cc
Author: Tom Rondeau <address@hidden>
Date:   Tue Dec 11 10:15:41 2012 -0500

    Merge branch 'master' into next
    
    Conflicts:
        gr-qtgui/grc/qtgui_sink_x.xml

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
git://gnuradio.org/gnuradio