Merge fix for Bug#4238 from trunk
commitf7912160c498869e56edc5472b94106fd772fb8d
authorChong Yidong <cyd@stupidchicken.com>
Fri, 22 Jul 2011 15:23:10 +0000 (22 11:23 -0400)
committerChong Yidong <cyd@stupidchicken.com>
Fri, 22 Jul 2011 15:23:10 +0000 (22 11:23 -0400)
tree7ac8b67700fe9d4e5f2a1961dfb06ca7f4b5edf2
parent17c87e18e5410b7077757f9852a2bb0e0cde54c6
Merge fix for Bug#4238 from trunk
src/ChangeLog
src/frame.c