Merged revisions 229669 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r229669 | dvossel | 2009-11-12 10:41:49 -0600 (Thu, 12 Nov 2009) | 6 lines
  
  fixes merging error, datastore was being freed in the wrong function.
  
  (closes issue #16219)
  Reported by: aragon
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@229670 65c4cc65-6c06-0410-ace0-fbb531ad65f3