uilib branch: Merge from trunk.
uilib branch: Merge from trunk.

svn path=/branches/libavg_uilib/; revision=7647

scotty007/libavg,scotty007/libavg,yyd01245/libavg,libavg/libavg,th3infinity/libavg,th3infinity/libavg,th3infinity/libavg,hoodie/libavg,libavg/libavg,libavg/libavg,libavg/libavg,hoodie/libavg,th3infinity/libavg,yyd01245/libavg,hoodie/libavg,yyd01245/libavg,scotty007/libavg,hoodie/libavg,yyd01245/libavg,scotty007/libavg