merge with master and fix 2 conflicts
authorPaul Davis <paul@linuxaudiosystems.com>
Thu, 17 Oct 2013 02:06:56 +0000 (22:06 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Thu, 17 Oct 2013 02:06:56 +0000 (22:06 -0400)

No differences found