Merge branch 'next'
authorPeter Korsgaard <jacmet@sunsite.dk>
Fri, 1 Mar 2013 10:11:24 +0000 (11:11 +0100)
committerPeter Korsgaard <jacmet@sunsite.dk>
Fri, 1 Mar 2013 10:11:24 +0000 (11:11 +0100)
1  2 
package/Config.in
package/qt/qt.mk

Simple merge
Simple merge