From: Carl Baldwin <carl@ecbaldwin.net>
Date: Sat, 13 Feb 2010 05:09:53 +0000 (-0700)
Subject: Merge commit 'origin'
X-Git-Tag: 2_3~2
X-Git-Url: http://git.pippins.net/embedvideo/static/%27%20%20%20%20.%20%24GLOBALS%5B%27phpgw%27%5D-%3Elink%28%27inc/jquery/x.gif?a=commitdiff_plain;h=refs%2Fheads%2Fcarl%2Fmaster;p=rip_dvd%2F.git

Merge commit 'origin'
---

1142be4419e004fa0b0aaccd0048529b6f4f0906