Merge branch 'maint'

diff --combined gnuradio-core/src/lib/io/gr_file_sink.cc
index d2c43aac7a31b1d8434db077d04640dc4ffcad66,706837c7a99a66aecac3e2291b7b3293cb88190e..aab0158e7ba8bc7ee1b9eafce6045e88ceb3c3be
--- 1/gnuradio-core/src/lib/io/gr_file_sink.cc
--- 2/gnuradio-core/src/lib/io/gr_file_sink.cc
+++ b/gnuradio-core/src/lib/io/gr_file_sink.cc
@@@ -1,6 -1,6 +1,6 @@@
  /* -*- c++ -*- */
  /*
-  * Copyright 2004,2006,2007 Free Software Foundation, Inc.
+  * Copyright 2004,2006,2007,2010 Free Software Foundation, Inc.
   * 
   * This file is part of GNU Radio
   * 
@@@ -32,7 -32,7 +32,7 @@@
  gr_file_sink_sptr
  gr_make_file_sink (size_t itemsize, const char *filename)
  {
-   return gr_file_sink_sptr (new gr_file_sink (itemsize, filename));
+   return gnuradio::get_initial_sptr(new gr_file_sink (itemsize, filename));
  }
  
  gr_file_sink::gr_file_sink(size_t itemsize, const char *filename)
@@@ -70,8 -70,5 +70,8 @@@ gr_file_sink::work (int noutput_items
      nwritten += count;
      inbuf += count * d_itemsize;
    }
 +  if (d_unbuffered)
 +        fflush (d_fp);
 +        
    return nwritten;
  }