Merge branches 'release', 'idle', 'redhat-bugzilla-436589', 'sbs' and 'video' into...
authorLen Brown <[email protected]>
Thu, 27 Mar 2008 02:50:09 +0000 (22:50 -0400)
committerLen Brown <[email protected]>
Thu, 27 Mar 2008 02:50:09 +0000 (22:50 -0400)

Trivial merge