Merge branch 'master' into obi/master
authorAndreas Oberritter <obi@opendreambox.org>
Mon, 20 Dec 2010 11:18:19 +0000 (12:18 +0100)
committerAndreas Oberritter <obi@opendreambox.org>
Mon, 20 Dec 2010 11:18:19 +0000 (12:18 +0100)
commit16c07b98245e94a162685803acd4ba4b5d4298a3
treee44802522d3c141ccc98e52a80016b862f60cf55
parent0fff842a5f2b4185257aadb6b6a3dfa033a91d72
parent0cbccde1b0264df7a0a5f8723b8de881f0d5f927
Merge branch 'master' into obi/master

Conflicts:
main/Makefile.am
main/Makefile.am