Merge branch 'stable-next' into stable
authorSebastian Pipping <sebastian@pipping.org>
Mon, 28 Mar 2011 18:22:23 +0000 (20:22 +0200)
committerSebastian Pipping <sebastian@pipping.org>
Mon, 28 Mar 2011 18:22:23 +0000 (20:22 +0200)
commit4f87856880d31496ff91d22bf3e6da793fb27b60
tree2ddd339fc5f8ccfadb4c235c5df9fc3e5fee861a
parent5a33ee4b485a902051beeece531d1e70b1fa73c0
parent9ee6216b31731ff169696faa5fbe2f49f638c58d
Merge branch 'stable-next' into stable