[SCM] gmerlin/master: Merge commit 'fc67264'

[zmoelnig-guest at users.alioth.debian.org]

fixed typo in manpage
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 4bd0b71d2cd0925d1ee645e9da1c0ea0116a3410
X-Git-Newrev: c7ec7350431501a70c43327687b8a3452b961dd1

The following commit has been merged in the master branch:
commit 85f7c9f60f837c7cede63f8d85a36479892a50ab
Merge: 4af442df49c5d88c229df54d28e43021ed1b6eef fc67264bd2280ab6af3be0ff4709571fceb4286e
Author: IOhannes m zmölnig <zmoelnig at iem.at>
Date:   Tue Jan 11 11:25:20 2011 +0100

    Merge commit 'fc67264'


-- 
gmerlin packaging